Modified the analysis script to change the figures
Merge branch 'master' of https://github.com/inspyred/energypub

Conflicts:
	NewGarrett_Energy_2014.pdf