Update vim settings
Add .sbt/0.13/plugins to ignore
Update cpp.vim plugin
Some zshrc updates
Merge branch 'master' of github.com:yesenarman/dotfiles

Conflicts:
	.vimrc