diff --git a/.gitignore b/.gitignore
index f6e17144d..fcc975a62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@ build
 deploy
 dist
 node_modules
-src/coffee/views.js
+templates.js
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index eaa0f215c..4d84b4950 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -152,7 +152,7 @@ module.exports = (grunt)->
     # Compound Tasks ###################################################################################################
 
     grunt.registerTask 'build', 'build the project to be run from a local server',
-        ['jade', 'build:copy', 'css', 'browserify:external', 'browserify:internal']
+        ['jade', 'build:copy', 'build:css', 'browserify:external', 'browserify:internal']
 
     grunt.registerTask 'build:copy', 'helper task for build',
         ['copy:assets_build', 'copy:common_source', 'copy:server_source']
diff --git a/scripts/s3_upload b/scripts/s3_upload
index b5e7cb5a0..ea36f424e 100755
--- a/scripts/s3_upload
+++ b/scripts/s3_upload
@@ -13,6 +13,7 @@ while [[ "$1" != "" ]]; do
         "--production") ENVIRONMENT="production";;
         *) die "Please specify environment: --staging or --production";;
     esac
+    shift
 done
 
 SOURCE_DIR="./dist/"