Bumping version to 2.0.0 for release.
Merge pull request #24 from thomthom/master

Bumping version to 2.0.0 for release.