Merge branch 'v3' into develop
Ready to release version 2.0.0
Merge branch 'release-2.0' into develop
Updated .gitignore to ignore pkg subdir for ruby tools.
Fixed up merge conflicts on .gitignore.