Update elpa
Merge branch 'master' of github.com:asvetlov/config