Added optional data directory
Merge branch 'master' of github.com:CSCI-4830-002-2014/challenge-week-12