Fixing Analytics and adding some more analytics markup.
Merge branch 'master' of github.com:manshar/manshar into fix-analytics
Merge pull request #86 from manshar/fix-analytics

Fix analytics and add some more analytics markup