Merge pull request #4 from BahamutDragon/master

AE Clean up
Retro AE changes from BD
Merge pull request #105 from bmhanson/master

Test pull after external merge