switch to vundle and re-org settings structure