Commit some new and old changes
Merge branch 'master' of https://github.com/macroevolution/bamm

Conflicts:
	Rcode/plot.dtrates.R