Updates some things
Merge branch 'master' of https://github.com/UbiquitousSpice/HackathonNovember2014