1. Fixed compatibility issues with guard 2.
2. Converted specs to use rspec 3 conventions.