Merge last month of upstream changes
Merge pull request #25 from codeforamerica/merge-upstream

Merge last month of upstream changes