Added old-www to settings.php as an alias for old-stage
Merge branch 'master' into staging