updates
Merge branch 'develop' of github.com:meriadec/dotfiles into develop

Conflicts:
	.vimrc