cleanup, vim-scala is now a plugin, pathogen updated