Make labrat look at tags rather than service names directly.
Merge remote-tracking branch 'pcf/master'

Conflicts:
	main.rb