ecryptfs fixes

Fixes #1158 and #1122, see commit messages.

Test being run: `2014-10-29_18-54-52_drinkcat_chroagh_multiline-pwd_1`.