Merge branch 'release-2.1'
Merge branch 'develop'
now using update_option
version bump & contrib credit update
readme updates
Merge branch 'hotfix-2.1.1' into develop