merging in remote changes and work
upgrade to universal analytics. remove commented out js