Comments and minor changes.
Merge branch 'jay_dev' of https://github.com/bwbecker/oat into bwbecker-jay_dev

Conflicts:
	app/controllers/Query.scala
	app/views/queries/index.scala.html