updates to tests that hit production services
Merge remote-tracking branch 'pubs-master/master'

Conflicts:
	pubs_ui/lettuce_testing/features/test_utils.py
Merge remote-tracking branch 'pubs-master/master'

Conflicts:
	pubs_ui/templates/advanced_search_form.html
reordering of requirements.txt
Merge pull request #115 from ayan-usgs/master

merged conflicts and reordered requirements.txt