Conflicts: Gemfile Guardfile README.markdown Rakefile lib/guard.rb lib/guard/dsl.rb lib/guard/interactor.rb lib/guard/listener.rb lib/guard/ui.rb lib/guard/watcher.rb spec/guard/dsl_spec.rb spec/guard/notifier_spec.rb