Added new plugins, reorganized vimrc