pulled helm -
pulled magit -
pulled php-mode -
pulled python -
pulled helm -
pulled magit -
melpa package-list-packages
Merge branch 'master' of github.com:graehl/.emacs.d

Conflicts:
	defuns/compile-defuns.el