Upgrade Ruby to 2.1.0
Update .rspec
Consolidate spec expectations
Fix typo in test desription
Remove unnecessary attr_writer
Refactor search