Fix merge again.
Symlink it properly
Merge pull request #81 from duncannz/master

Fix the merge, again