Merge branch 'dev' of https://github.com/tockins/realize into dev

# Conflicts:
#	settings_windows.go

settings_windows.go

@@ -5,4 +5,4 @@ package main
 // Flimit defines the max number of watched files
 func (s *Settings) flimit() error {
 	return nil
-}
+}