103 commits

Author	SHA1	Message	Date
Ryan Uber	b95ed91628	agent: merge telemetry, server, and client configs	2015-09-10 11:25:19 -07:00
Ryan Uber	bc683a800e	agent: config loading tests	2015-09-09 22:11:48 -07:00
Ryan Uber	faf5cc0447	agent: config merge works + tests	2015-09-09 21:42:50 -07:00