Remove accidental jekyll files.
Remove accidentally created jekyll files.
Merge branch 'master' into osx

Conflicts:
	vim/vim.symlink/eclim/autoload/eclim/taglisttoo/lang/cproject.vim
	vim/vim.symlink/eclim/ftplugin/ant/eclim.vim