Merge github.com:r0man/clout
Merge branch 'master' of github.com:ptaoussanis/clout