Small README fixes
Use new melpa URLs
change: merge from upstream