Merge pull request #86 from monkeysecurity/develop

Simplify nginx.conf