Merge pull request #193 from jow-/cjdns-move-tmp