Several fixes to prepare for heroku CI

This fixes #34