various things
Merge branch 'Philip' of https://github.com/BlueSpaceCanary/HackathonSp2013 into Philip