Closes #4 - Included model scopes break on includes and joins