Small bug fix and misc
Merge branch 'master' of https://github.com/macroevolution/bamm