Joe's ui changes to search page
Merge branch 'master' of https://github.com/bhavanaananda/datafinder.git

Conflicts:
	datafinder/web/search/templates/searchresults-mockup.html