Html for tabs should be working
Merge branch 'master' into tab-view

Conflicts:
	maptest.html
Tabs are now working
Added tabs and flipping between generation and consumption
Merge branch 'master' of https://github.com/JoshuaDickerson/hackvt-2014