Changes to be compatible with melpa

I'm not entirely happy with the summary in the header; you might want to edit this.