Added "include Housekeeping" to various models
Added "include Housekeeping" to various models
Added "include Housekeeping" to various models
Added "include Housekeeping" to various models (the end?)
Added "include Housekeeping" to various models (really the end?)
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/controlled_vocabulary_term.rb
	app/models/controlled_vocabulary_term/predicate.rb
(w/Matt) Bootstrapped housekeeping migration
Merge remote-tracking branch 'origin/master'