Updated to latest config
Merge branch 'master' of github.com:anvaka/dotfiles

Conflicts:
	vimrc