More refactoring to button things up.
Merge branch 'master' of https://github.com/OttoHagg/haro