Getting model specs to pass

Still leaves two of the specs in the red, for now, but it removes all the deprecation notices as well as bringing the rest up to passing when directly invoked (as in rspec spec/models) but there's still a lot of issues when using rake rspec instead. Still working out the best way to resolve those.