New convention for voted_on
Working constants/enums
removed obsolete comments
merged conflicts
Merge pull request #183 from benrudolph/voted-on

Voted on