bugfixes before pull from heather's morning work.
Merge branch 'master' of github.com:total-impact/impactstory-analytics