change somethings to merge
Merge branch 'molokai' of github.com:sixgram/vimimpl into molokai