added a timeline scaling
PRE.js functionality is absorbed into scaletimeline
Merge branch 'master' into gh-pages