Add optional  parameter to agent type (issue #1). Updated rspec_puppet to get new relationship matchers