Corrected wsgi settings
Mid-work commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	django_project/vota/models/committee.py
Extensive work on vota. Still lots to be done. Submit vote form not working.
Merge remote-tracking branch 'origin/master'