use port in db
Merge branch 'master' of github.com:dbp/rivet

Conflicts:
	src/Rivet/Tasks.hs
Merge branch 'master' of github.com:dbp/rivet
Merge branch 'master' of github.com:dbp/rivet
allow database-name to be set in Rivetfile
in simple-deploy, bind prod.cfg as Rivetfile for migrations, so that rivet db:migrate can have database connection info