fix html escaping in search placeholder text

cgi will not encode '"'.
Merge pull request #740 from xi/feature-fix-search-escape

fix html escaping in search placeholder text
pep8
Minor dependencies upgrade
Merge branch 'develop' into geo
Add .dummy to alembic/versions to make sure directory exists
Add 2.1.1 related changes to CHANGES.txt
Merge branch 'develop' into geo