Fix enum names, begin namespacing
First attempt at fully namespacing enums
Screwed up a delimeter
Fix more enums
Merge pull request #98 from dgriffen/master

Fix enum namespacing