Joe's UI changes - Merge2
Merge branch 'master' of https://github.com/bhavanaananda/datafinder.git

Conflicts:
	datafinder/web/contribute/urls.py
	datafinder/web/search/views.py