Updating spec tests to handle varying order of solr fields, etc. (DHH-184)
Merge branch 'feature/rails4' of github.com:ucsdlib/damspas into feature/rails4

Conflicts:
	spec/models/dams_object_datastream_spec.rb
Updating spec tests.
Revert "Trying to get component.complexSubject working"

This reverts commit 141874d070ba43a45d7dc61a70b93ef959b8f9b3.

Conflicts:
	spec/models/dams_object_datastream_spec.rb
Finally passing all tests (DHH-184)