add .env to .gitignore
use unicorn via procfile
change to unicorn
fix merge conflicts