Live tests for contact filtering
Enhance Contact Filtering tests using new features in Quaff 0.6.3
Merge branch 'ellis_refactoring' into accept_contact
Allow multiple bindings and do a more extensive contact filtering test
Add missing file
Merge branch 'ellis_refactoring' into accept_contact

Conflicts:
	lib/quaff-endpoint.rb
Merge pull request #64 from Metaswitch/ellis_refactoring

[Reviewer: Alex] Ellis refactoring
Merge remote-tracking branch 'origin/master' into accept_contact
Skip Contact-Filtering tests until pending fixes go in
Review feedback and ISC issues found in testing
Further fixes from testing
Merge pull request #65 from Metaswitch/accept_contact

[Reviewer: Andy] Accept-Contact test suite