fix page load vars/events when using setup + add tests
Resolves #14
Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/js/analytics.js
	dist/js/demo.js