Prepping ping merge.
Merge branch 'master' of github.com:jif/thehub
Pushing across so I can watch a movie :)