Merge pull request #634 from Foggalong/master

Ooonce, there was this guy who...
Symlinks. Fixes #640, #641, #642, #643 & #646