Add section about switching to nginx
Merge branch 'master' into saucy