minor tweaks
removed redundant vim-android
Various updates