add setting for MacVimmm
add alias l="ls -la"
Merge branch 'master' of github.com:hidechae/rc

Conflicts:
	.vimrc