Added android-vim
Merge conflicts