typo
save non-production version in git
gitignore update
gitignore update dos
Merge remote-tracking branch 'upstream/master'
Merge pull request #353 from jpecht/master

gitignore update