Merge pull request #125 from tbrooke/master

Minor fix
Merge pull request #126 from tbrooke/master

More tweaks on master to fix Heroku migration problem