Removing some unused stuff
Merge branch 'master' of github.com:AndrewLane/hackathon2014lets-get-physical