Fixed formatting on energy pages
Merge branch 'master' of https://github.com/dssg/dssg.github.io

Conflicts:
	energy/faq.html