update
Merge branch 'master' of github.com:Niedra/configs

Conflicts:
	.vimrc