update to match popolo, simplify rake tasks