Small README fixes
Use new melpa URLs
Merge remote-tracking branch 'origin/master'