Added energy upgrades
Merge branch 'master' of https://github.com/wjmelements/buildcraft