Refactor shcema, have sample data and queries all working
Merge pull request #30 from dsinkey/master

Refactor shcema, have sample data and queries all working