Add stricter error-checking

In upcoming commits, these errors will be incorporated into the
logging-system, so they don't look so out of place when issued.
tox_is_data_encrypted() was renamed to tox_is_save_encrypted()
We might eventually have logerr() and logwarn()
Fix vertical spacing
Merge branch 'master' into debian/unstable
prepare for release

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>
Merge branch 'debian/unstable' into ubuntu/trusty
prepare for release

Signed-off-by: Kill Your TV <killyourtv@i2pmail.org>