merging in upstream changes

Author: ma314smith

.gitattributes

@@ -0,0 +1,11 @@
+# Git to autodetect text files and normalise their line endings to LF when they are checked into your repository.
+* text=auto
+
+# git won't try to convert this files
+*.pem -text
+*.der -text
+test/static/**/*.xml -text
+
+# These files are text and should be normalized (Convert crlf => lf)
+*.gitattributes text
+.gitignore text

.gitignore

@@ -1,7 +1,8 @@
-node_modules/
-p.js
-p.txt
-*.svclog
-.DS_Store
-*.*~
-*.swp
+node_modules/
+p.js
+p.txt
+*.svclog
+.DS_Store
+*.*~
+*.swp
+npm-debug.log