Trying to remerge
Merge branch 'master' of github.com:jif/thehub