update changelog
use six.text_type instead of passlib.utils.compat.unicode, which is only in passlib>=1.6
use correct name for dev requirements file
update requirements-dev
update changelog
Merge branch 'master' into debian
update to make file
update standards version