readme updated with ngx* and apache vhost notes
typo
fixing self-imposed conflict
Merge branch 'develop'