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