Merge pull request #143 from croomes/missing_end

(MCO-147) Close code block with missing end
MCO-138 revert "18663 - should be internationalized"

This reverts commits c6b9451f8bd719c72335ccb2759feb1655055933 and 6d52920470a6135ac1368111d9ddfe3c50264bee.

The i18n based around the i18n gem was incomplete and a little hard to deal
with.  For now we're pulling this implementation out for the stable series and
will revisit it in a topic branch until we have something more mature.
Merge pull request #145 from richardc/revert_i18n

MCO-138 revert "18663 - should be internationalized"
(MCO-148) Add test coverage for logaudit plugin

This commit adds test coverage for the logaudit, audit plugin.
Merge pull request #144 from ploubser/bug/master/mco-148

(MCO-148) Add test coverage for logaudit plugin
MCO-151 - deprecate removed options

Rather than exploding on the use of the removed options we can just
warn about it them as they haven't had their semantics changed.
This should smooth people's upgrade path from 2.2.x to 2.4.x.
Merge pull request #147 from richardc/bug/master/mco-151

MCO-151 - deprecate removed options
maint - update changelog to 2014
maint - bring changelog up to date
Rewrite of Windows README

I attempted to follow this guide and found a number of errors and
omissions, so I cleaned it up and filled in some of the blanks. I still
couldn’t get the service to launch at the end, but this should get
people a bit closer.
Docs: Fix bad instructions about keystore passwords

Although it LOOKS like using a temporary password for the pkcs12 archive should
work, it will actually break. (I don't know why this is; keytool must be reusing
that password as a default value for something else when it does the import,
maybe the keypass.)
Merge pull request #149 from nfagerlund/docs_keystore_passwords

Docs: Fix bad instructions about keystore passwords
Merge pull request #148 from holguinj/master

Rewrite of Windows README
(maint) Remove version_strategy override

Previously, the version_strategy needed to be set at odd_even so that the
versioning strategy of mcollective would be reflected when building and
shipping a release. Now that mcollective is moving to semver with release
candidates, this setting can be removed, as semver with release candidates is
the default value.
Merge pull request #150 from haus/remove_version_override

(maint) Remove version_strategy override
(MCO-152) Release 2.4.0-rc1

Release first 2.4.0 release candidate.
Merge pull request #151 from ploubser/feature/master/MCO-152

(MCO-152) Release 2.4.0-rc1
maint: Fix release notes
Revert "maint - Add temp workaround for travis ruby 1.8.7"

This reverts commit 34f10c9db724510ea584a6f44d989c60ae8ffe25.

The underlying issue was was fixed in gem 2.2.1.
Merge pull request #153 from richardc/travis_187_working

Revert "maint - Add temp workaround for travis ruby 1.8.7"