Improved beautify, added more coffee
Merge branch 'next' of github.com:serenity/twtcst into next