wiki page changes
Merge branch 'master' of github.com:USGS-CIDA/PubsWarehouse_UI
Merge branch 'master' of github.com:USGS-CIDA/PubsWarehouse_UI
test
redo
Merge pull request #18 from mwernimont/master

CSS for wikis- fancy!
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pubs_ui/templates/browse.html
catch up with master, resolve merge conflicts