Updated CHANGELOG.rst to reflect changes.
2.10 is not released yet, moved changelog entry
Merge pull request #220 from norox/master

Updated CHANGELOG.rst
Merge remote-tracking branch 'arskom/master'