Merge branches 'home' and 'work' of ssh://github.com/nebbian/timeowl into home
Merge remote branch 'origin/work' into home
# sorting out documentation model
Merge remote-tracking branch 'refs/remotes/origin/home' into work
Merge remote-tracking branch 'refs/remotes/origin/work'
Merge remote-tracking branch 'refs/remotes/origin/master' into timeowl.perthweb.local