made a mess
Sorted Out Query Structures
Phew

streams are now in the database
updated docs
Merge remote-tracking branch 'origin/draft'
got rid of deets
Merge branch 'master' of https://github.com/gregroberts/Dashboard