Reinstate SUBSCRIBE-NOTIFY test
Code review feedback
Merge pull request #66 from Metaswitch/issue329sprout

[No reviewer required] Reinstate SUBSCRIBE-NOTIFY test
Merge branch 'ellis_refactoring' into accept_contact

Conflicts:
	lib/quaff-endpoint.rb
Merge remote-tracking branch 'origin/master' into ellis_refactoring

Conflicts:
	lib/tests/subscribe.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