Removed unneeded packages
Re-added vim-classpath
Updates