Remove includes from Location finders

I think the bullet gem was complaining at some point about N+1 queries, and now it's not anymore. Looking at the dev log, there are many more DB queries with the includes in there, so I'm taking them out.