Don't join, but include to keep associations read-write.
Bugfix for the has_one case.
Merge branch 'has_many' of github.com:schuetzm/acts_as_relation into has_many

Conflicts:
	lib/active_record/acts_as_relation.rb