Import Ubuntu's global vim settings.

Conflicts:
	vimrc
Fix more of my bad merging
Fix more of my bad merging cause I'm dumb
Merge branch 'master' of https://github.com/cadyyan/dotfiles
Add zsh login/logout scripts
Merge branch 'master' into ycm
Zshrc uses local options as well!