Updated to use Guard::Plugin rather than Guard::Guard
Removed depricated :rvm option
Removed deprecated setting
Fix erroneous comment
Merge remote-tracking branch 'dannysmith/master'
fix specs after Guard changes