Fold removed from vimrc
install pre merge
Merge branch 'master' of github.com:crioto/conf

Conflicts:
	install.sh