added json support, various vimrc changes