Merge branch 'master' of https://github.com/hrls/macvim
add new color scheme jellybeans from https://github.com/nanotech/jellybeans.vim
Merge branch 'master' of https://github.com/dokenzy/macvim