This should resolve the diff between master/slave when recreating the TaxonConceptPreferredEntry.
PL rightfully points out that setting the user needn't refresh the whole taxon concept, just the instance variables. Extracted method.
WIP - Working on specs, sorry.
Merge branch 'master' of github.com:EOL/eol
Fixed a problem where this caching thing on data objects with multiple DataObjectHierarchyEntry relationships was failing.

Conflicts:

	app/models/data_object_caching.rb
Ooof.  The problem appears to be with selectors... probably because nokogiri was updated.  Unfortunately, these fixes are SLOOOOOOOW to write.  More to come.