Created a config file for unicorn
Merge branch 'master' into email_validation