Merge branch 'model-formatter-precedence'

@@ -32,10 +32,10 @@ class Rivets.Binding
     for formatter in @formatters
     for formatter in @formatters
       args = formatter.split /\s+/
       args = formatter.split /\s+/
       id = args.shift()
       id = args.shift()
-      value = if Rivets.config.formatters && Rivets.config.formatters[id]
-        Rivets.config.formatters[id] value, args...
-      else
+      value = if @model[id] instanceof Function
         @model[id] value, args...
         @model[id] value, args...
+      else if Rivets.config.formatters[id]
+        Rivets.config.formatters[id] value, args...
 
 
     value
     value
 
 
@@ -194,6 +194,7 @@ Rivets.routines =
 # Default configuration.
 # Default configuration.
 Rivets.config =
 Rivets.config =
   preloadData: true
   preloadData: true
+  formatters: {}
 
 
 # The rivets module. This is the public interface that gets exported.
 # The rivets module. This is the public interface that gets exported.
 rivets =
 rivets =