Merge pull request #98 from codeforamerica/develop

Production push
Fixing overcounting issue (issue #97)
Merge pull request #99 from codeforamerica/dashboard

Fixing overcounting issue (issue #97)
Merge pull request #106 from codeforamerica/develop

fixing token issue
Merge pull request #109 from codeforamerica/develop

Merging in last minute changes