added semicolon

oopsies
Merge branch 'master' into mixpanel-integration

Conflicts:
	client/app/analyze/controllers/rules.js
Merge branch 'mixpanel-integration'
Merge branch 'master' into staging