update archive URL
update URL to use new FTP staging site
update apache conf to mount /opt/gms/ at /data/
Merge remote-tracking branch 'origin/apache-conf' into ubuntu-12.04-testmerge3

Conflicts:
	README.md
ensure "make update-repos" uses the variables for repo branch/tag