Several fixes to prepare for heroku CI
Merge pull request #35 from jriverac/fixes_pre_heroku

Several fixes to prepare for heroku CI