added google api gem and bundler_stubs
Merge branch 'develop' into qrcodez
added initializer for raisl google api wrapper
Merge branch 'develop' into qrcodez

Conflicts:
	app/controllers/omniauth_callbacks_controller.rb
added better errors config file
urlshortener working in lib/urlshortener
working with urlshortener in wines controller
added account activations join table
tried updating minitest but looks current
merged in develop