Merge pull request #647 from Foggalong/master

Symlinks. Fixes #640, #641, #642, #643 & #646
Shortcuts symlink