making method calls explicit
Merge branch 'master' into user_management
Issue #12 added mailcatcher and soem matchers for devise and mongoid
Issue #25 Added basic devise configuration
you can now register and login!
Issue #25 Added basic twitter integration
Issue #25 Added facebook support for omniauth
Merge branch 'user_management'

Conflicts:
	Gemfile.lock
	app/assets/javascripts/kiwi/components/image_trimmer.js.coffee
	app/assets/javascripts/kiwi/kiwi.js.coffee
	app/views/layouts/application.html.erb
Issue #25 added startup script for handling keys
added check for provider
added check for provider
touching up the facebook signin
added default url for staging
added staging config for mongoid
Merge branch 'master' of github.com:jlebensold/kiwi

Conflicts:
	Gemfile.lock
Merge branch 'image_trimmer'
Merge branch 'master' into image_trimmer
Issue #26 Adjust border widths to true 4:3 ratio

Create new image trim border sizes so that it will crop to a 4:3 ratio
Issue #26 Intensify trim border, remove view model

Make the opacity of the image trim a bit more intense. Remove a view model which
was originally part of the plan for the image trimmer, but is not needed now.
Issue #26 Reset image trimmer on new image

When a new image is loaded, remove all coordinates from the previous image
and reset the slider to the middle.