readme: use nginx 1.6.0
Merge branch 'master' into trunk-tracking