popup-kill-ring recipe
popup-kill-ring on github with autoloads and package-require
popup-kill-ring on github with autoloads and package-require
Merge branch 'master' of http://github.com/waymondo/melpa

Conflicts:
	recipes/popup-kill-ring
El-mock has moved to Github.
Add password-vault recipe
Simply use "cask exec ecukes" in travis build (see comment on e29be4b)
Merge pull request #932 from rejeep/el-mock-github

El-mock has moved to Github.
Merge pull request #933 from PuercoPop/password-vault

Add password-vault recipe
Add php-auto-yasnippets recipe

https://github.com/ejmr/php-auto-yasnippets
Add vagrant.el recipe
Merge pull request #935 from ottbot/master

Add vagrant.el
Adding clojure-cheatsheet.
Merge pull request #936 from krisajenkins/master

Adding clojure-cheatsheet.
Add efire recipe
Merge pull request #934 from yasuyk/php-auto-yasnippets

Add php-auto-yasnippets recipe
elpy: include snippets folder
Merge pull request #938 from ptrv/elpy-with-snippets

elpy: include snippets folder
Delete citrus-mode, mactag & package-spec (closes #939)
Add god-mode