Revert "Merge remote-tracking branch 'nycvotes/master'"

This reverts commit bf898fde75d2c42080c31145361ec82f97ccc6e7, reversing
changes made to 77737df9e0a3cec8e19d8273daf66524026558ef.

Conflicts:
	Gemfile.lock