resolved bundler conflict
faker and factory girl
setting up auto-populate
fixed map zooming
removed gemfile.lock for conflicts