Work in progress. No time today
Merge branch 'master' of github.com:mre/bromance