Dictionary updates; OS compat. fixes with vimrc