Send OS class to master on announce
Send full OS name to master
Fix tests
Fix import in test case
Merge remote-tracking branch 'guidow/send_os_to_master'

Conflicts:
	pyfarm/agent/service.py