Minor cleanup
Merge branch 'cleanup' into type-cleanup

Conflicts:
	src/main/scala/scoop/ast.scala
	src/main/scala/scoop/query.scala
Cleaned up type hierarchy