Fixed history so doing previous and then adding removes deeper history.  Cleaned up keymapping code.  Cleaned up project package code.  Tried to cleaned up the syntax highlighting code. Someone with more Vim knowledge will have to look at it.