Configure rainbow parenthesis
Merge branch 'master' into macosx

Conflicts:
	vimrc