Added annotations to traitcontrol; removed params to deprecate
Merge branch 'master' of https://github.com/macroevolution/bamm