added env to .gitignore
Merge branch 'master' of https://github.com/olin/planet