catch up with master, slightly change gitignore
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #26 from ayan-usgs/master

nav search working...
Merge pull request #27 from ayan-usgs/master

committed search_results.html
fix some links, fancy up displaylinks
get up to date with master
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Requirements.txt
Merge pull request #28 from jkreft-usgs/master

tweak search, prettify pub pages
experiments on pagination