Changed one_to_one associations to many_to_one
Merge branch 'master' of github.com:bethesque/pact_broker
Merge branch 'master' into beth2

Conflicts:
	lib/pact_broker/models/pact.rb