Rebase nginx formula from mxcl/master

I've re-introduced your changes to the nginx forumla onto the latest version from mxcl/master.


You can ignore my changes to the README.