Deploy to a new location

Allows us to support running separate Ruby versions on the app and
scraper servers
Remove commented out code
Set default branches but allow us to change them on the command line