Added support for emacs23 which is what I'm stuck with in ubuntu at work.
Don't commit archives contents for elpa.
Merge branch 'master' of github.com:brendan/emacs.d

Conflicts:
	elpa/archives/gnu/archive-contents
	elpa/archives/marmalade/archive-contents