Updated vimrc and removed osx specific parts of tmux.conf