Re-worded / re-organized data config window.
Misc changes.
Merging Dan's changes
Merge pull request #2 from danlurie/master

Merging Dan's changes