add elpy
Merge branch 'master' of https://github.com/suyuxin/emacs.d

update
Revert "Merge branch 'master' of https://github.com/suyuxin/emacs.d"

This reverts commit 476d8c700bb320dec4c3f0271867fa4b08a09485, reversing
changes made to 60239dd2acd30624bc443e4b282b370913362916.
update