Local chabges.
Merge branch 'master' of github.com:eugeneai/emacs-for-python

Conflicts:
	elpa/archives/gnu/archive-contents
	elpa/archives/marmalade/archive-contents
	elpa/archives/melpa/archive-contents
Merge branch 'master' of github.com:eugeneai/emacs-for-python
Adjusted behavior of epy-mode in emacs 24.4
Made auctex to start correctly