Update to Ruby 2.0, change to expect syntax for specs
Merge pull request #1 from bricknmo/feature/change_to_expect_syntax

Update to Ruby 2.0, change to expect syntax for specs