small changes to make MELPA compatible

MELPA:
http://melpa.milkbox.net/
https://github.com/milkypostman/melpa