Adjustment model refactoring
Moved shoulda-matchers into test/development so Rubymine could run the specs that used them
General clean-up of model code and tests
Replaced 'name' methods with delegation to the correct classes
Replaced finder methods with scopes