Updates for #590, #581, and adding Google Analytics tracking.