Cache information to improve speed
Merge remote-tracking branch 'origin/master' into dalvik

Conflicts:
	autoload/javacomplete.vim