Fixes for ELPA support (v2)

This extends/replaces/ close #1756.

Basically follows https://github.com/dimitri/el-get/pull/1756#issuecomment-43448726, with a bit of cleanup.