Melpa update

@nicferrier I don't know if there's anything else that needs to be done. Note that I targeted the PR on `master` since Github didn't like that I targeted the `melpa` branch.