refacto for handling multiple datasource types
Merge branch 'master' of https://github.com/youknowriad/node-report