Tweak models, fix data export and chart
Cleaning up
Oops, more cleanup
Merge pull request #1 from elidourado/master

Tweak models, fix data export and chart