Fix issue with timeout defaulting to 0
Update Rake task for new version of Rubocop
Update RSpec syntax for RSpec 3
Merge pull request #26 from test-kitchen/roboticcheese/fix-timeout-bug

Fix bug with timeout defaulting to 0 instead of 600