Cleanup of a bit of cheeky mess that came in from SVN.
Merge branch 'master' of github.com:jamesread/japella