Remove javacomplete
Add Shougo's fork of javacomplete

This seems more avtively developed
insert-mode mapping for jk -> <ESC>
Merge branch 'master' of https://github.com/ohle/vimrc

Conflicts:
	bundle/javacomplete