Finds Keywords by looking for Capitalised words and groups adjacent capitalised words together.
Merge branch 'master' into keywords
Fixed a bug and added some tests.
Merge branch 'keywords'

Conflicts:
	build.sbt
Merge branch 'master' of github.com:guardian/shame-api