Merge pull request #65 from codeforamerica/admin

Improved importing of test data
Merge branch 'master' into admin