Return to prev impl of lookup handling to avoid duplicates, but improve it.
Don't include 'name' in source and domain labels
Delete now-unused helpers
Remove sunspot loading from spec helper
Remove code commented out in last commit