use new ruby syntax and reduce query count
Merge pull request #59 from adityakapoor/controller-cleanup

Some controller cleanup