Merge branch 'develop'
Update the gem spec to be more accurate/current
Merge branch 'master' into develop