Add javaid syntax file
Pull hybrid changes from upstream
Weechat changes
Add makeprg for java files
Some minor changes to vimrc including removing a mapping that will make
v faster