modified gvim use molokai
Merge branch 'master' into windows