no https
Merge branch 'master' of https://github.com/solidline/sl-vim

* 'master' of https://github.com/solidline/sl-vim:
  no https

Conflicts:
	.gitmodules
Not using taglist-plus anymore
Removed neocomplete and added a couple markdown plugins to try.
Updating eclim
Updates, along with eclim.