Finish up Energy Collectors
Merge branch 'master' of https://github.com/multiplemonomials/Equivalent-Exchange-Reborn
Add missing BlockEnergyCollector.java
Rewrite the Ring of Flight code using Baubles to be better and faster.  This makes Baubles a REQUIRED DEPENDENCY for the Ring of FLight to work.
Merge pull request #1 from multiplemonomials/master

EER Pull request test