Merge pull request #1 from willcalderbank/develop

Fix ftlabs#114 maxFlingDuration not being taken into account

Author: willcalderbank

lib/ftscroller.js

@@ -1067,8 +1067,7 @@ var FTScroller, CubicBezier;
 							{ duration } = log( { speed } / { initial speed } ) / log( { friction } )
 						*/
 
-						flingDuration = Math.log(_kMinimumSpeed / Math.abs(movementSpeed)) / Math.log(_kFriction);
-
+						flingDuration = Math.min(_instanceOptions.maxFlingDuration, Math.log(_kMinimumSpeed / Math.abs(movementSpeed)) / Math.log(_kFriction));
 
 						/* Calculate the fling distance (before any bouncing or snapping).  As per
 						TouchScroll, the total distance covered can be approximated by summing