Add some missing code, fix some bugs

Forgot to copy over the regex line from when I was editing
in .vim/eclim---whoops!