Fixed some stuff, probably
Merge branch 'master' of https://github.com/JoshuaDickerson/hackvt-2014