Moved my env-specific stuff to .git/info/exclude
Merge branch 'master' of github.com:x89/Shreddit