some py3 support
Merge branch 'master' of github.com:eventray/hem

Conflicts:
	hem/schemas.py
updated version
allow the dbsession to be a callable
py3 support
short circuit if you have defined a session on the request
Merge branch 'master' of github.com:sontek/hem

Conflicts:
	hem/db.py
	hem/text.py
Fixed bug with callable and scoped_session
bump version for release
Give a nice default to generate_random_string
Merge branch 'master' of github.com:eventray/hem
remove mention of horus from error message