setting up to do vim + ios again
Merge with master
remove classpath temporarily
Fix vimrc merge conflict that got checked in