Merge branch 'master' of github.com:grauwoelfchen/guard

Conflicts:
	lib/guard/notifier.rb
Merge branch 'master' into stumpish-notifier
Merge branch 'stumpish-notifier' of github.com:grauwoelfchen/guard into stumpish-notifier

Conflicts:
	lib/guard/notifier.rb