WIP: Spec code clean up -- first pass
Merge pull request #34 from geopet/spec_cleanup

WIP: Spec code clean up -- first pass