Removing issues from bad merge.
seeds.rb still needs to be fixed to make some of the feature tests work again.