include rake in Gemfile.lock
fixes to uibaselineadjustments
Merge branch 'master' into osx