Merge branch 'master' into 500_on_signup
Merge branch 'master' of heroku.com:brigade-staging
Merge branch 'master' of github.com:codeforamerica/brigade