Fixing error when strings are not unicode
Updated the voting system. Big change.
Merge?
Merge branch 'master' of https://github.com/sandb/getopinionated.git

Conflicts:
	proposing/admin.py
	proposing/models.py
	proposing/views.py
	templates/proposal/detail.html