Fixed weird thing with changes disappearing
Merge branch 'master' of github.com:JoshuaDickerson/hackvt-2014
Html for tabs should be working
Merge branch 'master' into tab-view

Conflicts:
	maptest.html
Click load data.
Tabs are now working
Writing up series data querying.
SeriesId
Added tabs and flipping between generation and consumption
Merge branch 'master' of https://github.com/JoshuaDickerson/hackvt-2014
Merge branch 'master' of github.com:JoshuaDickerson/hackvt-2014
Loading Data For PowerPlants
Fixed typo