Cleaned up the rest of vim-android