Many changes. Cleared out most unneeded. Added rspec, etc