Fixes more Travis config errors
Adds db prep task to travis config
Adds migration command to travis config
Merge branch 'travis' into travis-fix

* travis:
  Adds migration command to travis config
  Adds db prep task to travis config
  Fixes more Travis config errors

Conflicts:
	.travis.yml