Add fold settings
Set cursorline
Add comments
Merge branch 'master' into mac

Conflicts:
	vim/.vimrc