Add vim-slim and vim-spartup
Merge branch 'master' of github.com:allenlsy/.vim

* 'master' of github.com:allenlsy/.vim:
  Add vim-sparkup vim-slim
  Add ag.vim
  Add vim-trailing-whitespace
  Add vim trailing whitespace

Conflicts:
	.gitmodules