Fixed some conflicts. Rspec still doesn't work.