I have no idea what I've done... Deal with it...
Merge branch 'master' of https://github.com/bardes/ore