Fixed grammar in whois output for +k'd services.
Merge pull request #465 from Shawn-Smith/master+ServicesOperGrammar

[2.2] Fixed grammar issue
Merge pull request #472 from SaberUK/master+merge-headers

Merge inspircd_{config,version}.h into a single header file.
Purge the 1.1 config deprecations.
Add the ability to deprecate config values as well as keys.
Merge pull request #474 from SaberUK/master+better-config-deprecation

Improve the config deprecation system.
Current progress (unfinished).