Fixed some url construction problems.
Add ENCFS_UID as a plugin option because it was hardcoded and set to 33.
Merge remote-tracking branch 'origin/master'