:Merge branch 'master' of github.com:alphagov/govspeak
:Merge branch 'master' of github.com:alphagov/govspeak

Conflicts:
	test/govspeak_test.rb

met-office-lab/govspeak,alphagov/govspeak,met-office-lab/govspeak,alphagov/govspeak