CHANGELOG and version bump for 4.0.0.pre2
Updates to CHANGELOG from review and re-reading
Adding commit count to CHANGELOG
Merge pull request #921 from shoes/version_and_changelog_4.0.0.pre2

CHANGELOG and version bump for 4.0.0.pre2