Merge branch 'master' of https://gitlab.com/2014hackathon/letsgetphysical into dan
Merge branch 'dan' of https://github.com/AndrewLane/hackathon2014lets-get-physical into dan
merge