not really sure here
Merge branch 'master' of github.com:littlenag/akwire

Conflicts:
	agent/lib/akwire/collectors.rb
	agent/lib/akwire/dsl.rb