add .env to .gitignore
use unicorn via procfile
Merge branch 'master' into production
fix merge conflicts
Merge branch 'production'