Big cleanup, that's all
Merge branch 'master' of http://github.com/aquinter/lessenrooster