Owner for Dataobjects needed to be html_safe
Updated broken route
Ooops, wrong fix for data object names.  Sigh.
Argh.  I fixed this, but I must have done it on master instead the branch... or something.  Argh.
Fixed bug where attributes with no derivable label break data search
Merge branch '2013.11.26'

Conflicts:
	app/views/data_objects/_attribution_minimal.html.haml
	app/views/layouts/v2/data.html.haml