Added data-dir option
Allow data_dir to be specified; initialise DataSource on use
Check directory can be configured
Merge pull request #1 from ldodds/make-data-dir-configurable

Make data dir configurable