Merge pull request #1 from jvrunion/master

first push of a clone of energy
pre-merge
Merge branch 'master' into gh-pages

Conflicts:
	mantle/dist/index.html
	mantle/dist/styles/41eb030a.main.css
	mantle/dist/styles/b91368fd.main.css
	mantle/dist/styles/f30fb335.main.css
basic leaflet intergration
work on the main page content
stashing changes for a merge
Merge branch 'gh-pages'
stashing for new dist push