Fixed a ton of bugs that came up during the merges
Merge remote-tracking branch 'origin/master'

Conflicts:
	search/_constants.py
	search/forms.py
	static/js/search.js