Create .vimrc
Rename .vimrc to vimrc
Update makesymlinks.sh
Merge branch 'master' into vertigo