Merge pull request #34 from cloudspace/staging

Staging
Reduced queries on the companies api endpoint

For some reason, also had to delete spec files with no matching class.
Not sure how this got past code review.
Merge pull request #35 from cloudspace/63682266_too_many_queries

Reduced number of queries for the companies endpoint