Add conf
Merge branch 'feature/cascalog_two' of github.com:nathanmarz/cascalog into feature/cascalog_two
fix self join