Feature/fix prediction

Addresses #53. Reverted training data to pre-trs. @tucotuco, we can change prediction model on demand for prediction, so if we can detect that a locality has trs (maybe via Python find method), then we can switch to trs model for it. Thoughts?