Merge pull request #10 from zeke/master

CORS support got lost in the nginx refactor