Add elpa specific
Add GNU global support
Merge up