No full screen macvim @ start.
Rempaing at Quicklist
Merge branch 'master' of github.com:raulmpad/.dot_files
Conflicts solved

Conflicts:
	.vimrc