Quick bug Tony found.
Merge branch 'master' of https://github.com/large-frye/trinity