Merge branch 'master' into develop
Removing .rvmc from project
Ignoring .ruby-version file
Updating git ignore file
Merge branch 'develop'