Fixed compatibility issues with guard 2 and converted specs to use rspec 3 conventions