Stuff.
Merge branch 'master' of https://github.com/xcabbage/trololus
Fixing stuff