Further work
Merge branch 'master' of github.com:s--g/GovHack2013
Finalising things
Merge branch 'master' of github.com:s--g/GovHack2013