google analytics changes to add demographics tracking
Merge branch 'master' of https://github.com/kaychaks/Vapor

Conflicts:
	default.hbs
Server changes to theme