Update to rspec 3
Fix brands and in memory specs
Fix default repository not resetting
Sort required files to 'fix' dependency issues