current vimrc
Merge branch 'master' of https://github.com/marceld89/files

Conflicts:
	vimrc