Fixed timeframe bug in TS, beefed up batch processing
Merge branch 'master' of https://github.com/Thomite/pampropy