some cleaning up. also, my laptop is moody these days...
Merge branch 'master' of https://github.com/rogerww/SkyPet