merge in changes from master

changes to align up to 6b07aa8 on master:
- fixing domain name in scripts and links
- updating script-source attribute
- updating Google Analytics ID