Fixed issue #46

- This should work (for now?)
- I might see if I can make it more robust as I continue to become more
  comfortable with Vim syntax file coding
- Also cleaned up some dead nextgroups