Merged fixes from master
Added PORT setting (from environment) to Procfile