Replaced .vimrc with Linux fixed version; added OSX version