Tidying and tightening up project
Merge branch 'master' of https://github.com/pwholmes/geppetto