Cleanup mostly, fixing variables and such
No errors thrown when GenerateAggregate() is called directly.
merge master
reformatting for PSR-2
Merge pull request #25 from SensibleUX/rewiring

Rewiring