Updated .gitignore
Updated Gemfile.lock
Various changes