- combining locations
- clean up queries
- sort out workflow
- break out charts into separate ns
Merge remote-tracking branch 'origin/master'