Apiary to rspec

Rebased on latest development branch.

I also refactored the DB cleanup process for the specs.
All of the specs passed (generated and original, too).