Update to new Google Analytics tags, and add tags to the "maker".