Merge pull request #21 from kaitlin/master

Backend changes for CSV export, updates to data loader, new data
fix #23
fix #26
Merge pull request #28 from shawnbot/master

Fix #23 and #26
fixes #24, closes #22