Extreme super mega happy fun time refactor
Merge branch 'master' of http://github.com/GraniteTeam/Granite