lettuce experiments
Merge remote-tracking branch 'pubs-master/master'

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

Conflicts:
	pubs_ui/Lettuce_Tests/features/test_utils.py
	pubs_ui/Lettuce_Tests/features/test_utils_2.py
Merge remote-tracking branch 'pubs-master/master'
added flask-images for PUBSTWO-1076
Merge pull request #50 from jkreft-usgs/master

added flask-images for PUBSTWO-1076
Merge remote-tracking branch 'pubs-master/master'

Conflicts:
	pubs_ui/templates/publication.html
Merge pull request #51 from ayan-usgs/master

merge of no major changes
removed test of global namespace
moved flask-images call to init
Merge remote-tracking branch 'upstream/master'
Merge pull request #52 from ayan-usgs/master

removed test of global namespace
Merge remote-tracking branch 'upstream/master'
Merge pull request #54 from jkreft-usgs/master

move flask-images to init
have titles being displayed... not pretty, but they're there
added logging
added custom jinja 2 filter
clean-up of __init__.py
recent pubs now displayed
added custom jinja filters