Reduced number of queries for the companies endpoint

Had to delete some extra spec files that should have already been deleted.

References: https://www.pivotaltracker.com/story/show/63682266