Switch back to ELPA for most things

ELPA is the official Emacs route, I should use that wherever
possible. I'm keeping el-get around for things that would normally be
special-cased git submodules that require Make etc., because el-get can
help me manage those in code.