Only grep through java files when editing a java file.
Merge remote-tracking branch 'origin/master'

Conflicts:
	vimrc