data layer pretty much finished
Merge branch 'master' of https://github.com/colinman/predictionary