Default vim conf improve
Mac Settings
Merge branch 'master' of github.com:pacsee/essential

Conflicts:
	setup.sh