updating all the stuff
Merge branch 'master' of https://github.com/large-frye/trinity