changed data loading
Merge branch 'master' of github.com:mgerring/datafest-moneymap
changed how data loads and stuff