[O] Cleaning up my org setup, using version from git

[Marcelo de Moraes Serpa]

Hey guys,

I'm trying to update to org 8.0, and also clean up my org setup, as it looks like it still loads some of the .el files out of the Emacs std distribution (I'm using  Emacs 23.4.1 (x86_64-apple-darwin, NS apple-appkit-1038.36)). 

I have org in ~/.emacs.d/vendor/org, and I also added the following lines to my init.el:

(add-to-list load-path (cons (concat dotfiles-dir "vendor/org/lisp")  load-path))

(add-to-list load-path (cons (concat dotfiles-dir "vendor/org/contrib/lisp")  load-path))

But it fails hard when emacs inits:

Warning (initialization): An error occurred while loading `/Users/fullofcaffeine/.emacs.d/init.el':
error: Autoloading failed to define function org-babel-do-load-languages
To ensure normal operation, you should investigate and remove the
cause of the error in your initialization file.  Start Emacs with
the `--debug-init' option to view a complete error backtrace.

When I try to "make autoloads" I get the following:

> org git:(master): make autoloads
> ======================================================
> = Invoke "make help" for a synopsis of make targets. =
> = Created a default local.mk template.               =
> = Setting "oldorg" as the default target.            =
> = Please adapt local.mk to your local setup!         =
> ======================================================
> End of file during parsing
> make: [local.mk] Error 255 (ignored)
> make -C lisp autoloads
> rm -f org-version.el org-loaddefs.el org-version.elc org-loaddefs.elc org-install.elc
> org-version: 8.0-pre (release_8.0-pre-150-g412d98)
> End of file during parsing
> make[1]: *** [org-version.el] Error 255
> make: *** [autoloads] Error 2

Not sure where to go from here. 

How could I clean up the org installation so Emacs only loads the version from git? 

Thanks in advance,

- Marcelo.