Track CPU names of agents
Merge remote-tracking branch 'guidow/track_agent_cpu_names'

Conflicts:
	pyfarm/master/templates/pyfarm/user_interface/agent.html
	pyfarm/models/agent.py
	pyfarm/models/core/cfg.py
	tests/test_master/test_agent_api.py