PHPSpec macro
Merge branch 'master' of github.com:rgpjones/ps-tools

* 'master' of github.com:rgpjones/ps-tools:
  Updates