ipython
update, smex, yas, jedi, ignore archives
Merge branch 'master' of github.com:d2207197/.emacs.d

Conflicts:
	elpa/ctable-20131119.1912/ctable-pkg.el
	elpa/elpy-20131109.2020/elpy-pkg.el
	elpa/git-commit-mode-20131124.2132/git-commit-mode-pkg.el
	init.el
auctex