local config fix
Gemfile.lock ignore
Merge branch 'master' of github.com:jywarren/plots2