delete old max shift cred file
Merge branch 'master' of https://github.com/macroevolution/bamm
minor typo fix
Force R to store variable as double
Fix code to allow for user control of both x and y axes.
Support separate prior on root process in both TraitModel and Model
Merge branch 'master' of https://github.com/macroevolution/bamm
Fix bug: Set the log likelihood after adding event
Merge branch 'master' of github.com:macroevolution/bamm
Fix loglik bug in model.cpp + remove refs to trait likelihood
Merge branch 'master' into refactor

Conflicts:
	src/Model.cpp
	src/Model.h
	src/Prior.cpp
	src/Settings.cpp
	src/Settings.h
	src/TraitModel.cpp