Made the font size consistent in VimApp

Made the font size between the main editor and the margin control
consistent in VimApp.
Fixed up a small number of TODO items
Merge branch 'master' of https://github.com/jaredpar/VsVim