Fix tests to get everything up-to-date and passing again, and add jbuilder gem
Refactor code, use jbuilder, DRY it up, optimizations (use "includes" to greatly reduce # of queries)