added numbertoggle plugin
testing vimfiler options
added delimitMate plugin
fixed merge conflict in vimrc