Tidying up
Merge branch 'master' of github.com:JonCanning/SkyScraper