Add RACK_ENV to Procfile, port to .foreman file
Fix conflicts