Merge pull request 'fix some options' (#237) from fixes into master

Reviewed-on: #237

config/options.go

@@ -197,7 +197,7 @@ func NewWatchOptions(opts ...options.Option) WatchOptions {
 }
 
 // Coalesce controls watch event combining
-func Coalesce(b bool) options.Option {
+func WatchCoalesce(b bool) options.Option {
 	return func(src interface{}) error {
 		return options.Set(src, b, ".Coalesce")
 	}

flow/options.go

@@ -134,3 +134,10 @@ func Fallback(step string) options.Option {
 		return options.Set(src, step, ".Fallback")
 	}
 }
+
+// ID sets the step ID
+func StepID(id string) options.Option {
+	return func(src interface{}) error {
+		return options.Set(src, id, ".ID")
+	}
+}

options/options.go

@@ -187,10 +187,3 @@ func Timeout(td time.Duration) Option {
 		return Set(src, td, ".Timeout")
 	}
 }
-
-// ID sets the step ID
-func StepID(id string) Option {
-	return func(src interface{}) error {
-		return Set(src, id, ".ID")
-	}
-}