whitespace and margins
Fix bug with aborted fling animations.
Merge branch 'master' into gh-pages