Update vimrc
Small updates
Merge branch 'master' of https://github.com/abcdw/configs

Conflicts:
	dotfiles/tmux.conf