Updated nginxconf for a common codebase, other drupal improvements
Merged