Add methods to Prior class
Merge branch 'master' into old_dan

Conflicts:
	src/TraitModel.cpp