Subtle bug when associations have only *one* DataObjectsHierarchyEntry, fixed.
Added percentages of hotlist pages to statistics page #DATA-1265
Merge branch 'master' of github.com:EOL/eol
Data Object needs to reload with cache clearing, now.
Remove the rvmrc, grrr.
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.
Fixed a bug with overview text with translations
(cherry picked from commit fcdf121a7a736d6cdbf80749e34f8849a56ef21e)
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.
Okay, we're green with one exception, but that one's rare, so I'm trapping it with a debug the next time it comes up. Stay vigilant.
Merge branch 'master' into virtuoso

Conflicts:
	Gemfile.lock