Restructure specs and move to RSpec 3.
Merge pull request #3 from aprescott/spec-changes

Restructure specs and move to RSpec 3