Take advantage of namespaced enums to make variant names shorter #124

Merged
merged 7 commits into from Jan 5, 2015