bring in timeseries
Merge branch 'master' of https://github.com/thumbert/rascal
must have forgot to pull first