recrypt fixes
Merge branch 'master' of github.com:yaybu/yaybu

Conflicts:
	yaybu/core/recrypt.py