Resolved conflicts w/ merge from Dimitri; took his changes
Have our first rspec checking working