Bring back the bounty_with_vote factory, which was accidentally removed.
Fix some FactoryGirl invocations that didn't get updated to the new traits syntax.