Merge branch 'master' into heroku
Merge branch 'develop'
Merge branch 'master' into heroku
Merge branch 'develop'
Merge branch 'master' into heroku
Merge branch 'develop'
Merge branch 'master' into heroku
WAT
BUMP
Fix errant jobs that were being created on startup
Merge branch 'heroku'
Merge branch 'master' into develop