Hacked some more shortcuts into Vim