Working specs to pass locally

With changes to ActiveFedora, need to account for change in default
PID (it has become nil.)

Also, I'm unable to get jp2 to run through imagemagick; Changed to jpg

To consider, many of the controller tests are doing things that should
be moved to model tests. @TODO
Merge pull request #227 from projecthydra/updating-specs-to-run-locally

Working specs to pass locally