added google analytics
merged upstream
made our button tip us
changed copy