Modified vimrc
Merge branch 'mac' of https://github.com/howardxu/dotvim into mac

Conflicts:
	vimrc