Create filetype setting file for java
Update Neobundle
Change CtrlP keymaps as C-M-?
Merge branch 'master' of grauwoelfchen.net:vim

Conflicts:
	.vimrc
Add acpi as ctrlp launcher entry