initial commit
Merge branch 'master' of https://github.com/jasonabullard/nginx-1.6.0