Merge in master branch
Merge pull request #21 from codeforamerica/bootstrap-time

Pull yourself up by your bootstraps
Merge in master