Added .env to .gitignore
Merge branch 'master' of github.com:paulbooth/entrance
Merge branch 'master' of github.com:paulbooth/entrance