Merge pull request #1 from naggie/master

initial mac setup is now done by prerequisites/osx.sh
James' username changed, still left symlink
Merge pull request #58 from jimjibone/master

symlinks change username