Merge branch 'master' into grunt

lib/scripts.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Scripts and stylesheets
+ * Enqueue scripts and stylesheets
  *
  * Enqueue stylesheets in the following order:
  * 1. /theme/assets/css/main.min.css
@@ -10,7 +10,6 @@
  * 2. /theme/assets/js/vendor/modernizr-2.6.2.min.js
  * 3. /theme/assets/js/scripts.min.js
  */
-
 function roots_scripts() {
   wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, '99a8db779c85fab09c1780951893470f');
 
@@ -37,7 +36,6 @@ function roots_scripts() {
   wp_enqueue_script('jquery');
   wp_enqueue_script('roots_scripts');
 }
-
 add_action('wp_enqueue_scripts', 'roots_scripts', 100);
 
 // http://wordpress.stackexchange.com/a/12450
@@ -55,7 +53,6 @@ function roots_jquery_local_fallback($src, $handle) {
 
   return $src;
 }
-
 if (!is_admin()) {
   add_filter('script_loader_src', 'roots_jquery_local_fallback', 10, 2);
 }
@@ -68,7 +65,6 @@ function roots_google_analytics() { ?>
     s.parentNode.insertBefore(g,s)}(document,'script'));
 </script>
 <?php }
-
 if (GOOGLE_ANALYTICS_ID) {
   add_action('wp_footer', 'roots_google_analytics', 20);
 }