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

[No reviewer required] Reinstate SUBSCRIBE-NOTIFY test
Merge remote-tracking branch 'origin/master' into ellis_refactoring

Conflicts:
	lib/tests/subscribe.rb