Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md

Author: Aaron Triantafyllidis & Rick Reilly

bin/compile

@@ -86,13 +86,6 @@ elif test -d $cache_dir/node/node_modules; then
 
 fi
 
-# Handle npm's new cert bug
-# http://blog.npmjs.org/post/78085451721/npms-self-signed-certificate-is-no-more
-if [ ! -f "$build_dir/.npmrc" ]; then
-  status "Writing a custom .npmrc to circumvent npm bugs"
-  echo "ca=" > "$build_dir/.npmrc"
-fi
-
 # Scope config var availability only to `npm install`
 (
   if [ -d "$env_dir" ]; then