Updated to link .vimrc
Merge branch 'master' of https://github.com/sc999/setup