kill extra whitespace
simplify Gemfile
Merge branch 'master' into reterm_for_scopes