#125 Cleanup
- Some linting
#155 Collection JOIN
- Cross collection JOINS are now added
#155 Support for calculated metrics