Upped the dependency on cryptography to 0.5.1
Merge branch 'master' into dsuch-f-gh278-add-smtp