Reorganized vimrc, returned bundle commands (after was broken)