Post-demo tidying up of code (a little bit - it's still very messy)
Merge branch 'master' of github.com:poshaughnessy/PsnHackJune13