push mixpanel people integration
Merge branch 'master' of github.com:wmm-olin-scope/stories.edu

Conflicts:
	client/js/postcard/make.coffee