Fixed bugs related to merging issue 40
Merge remote-tracking branch 'origin/dev' into dev

* origin/dev:
  Added Google Analytics calls for tracking site-wide track plays - fixes #37