More cleanup?
Merge branch 'master' of https://github.com/warebot/golasto