changed .gitignore defaults
Merge branch 'master' of github.com:smadhueagle/prelude