added support for extra-cookbook modules
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of git://github.com/priestjim/nginx

* 'master' of git://github.com/priestjim/nginx:
  added support for extra-cookbook modules