Updated overall state based on zoom occuring
Merge branch 'master' of https://github.com/JoshuaDickerson/hackvt-2014