Remove yaml from Gemfile
Merge branch 'develop' into lee