updating gemspec
Upgrading to mongoid 3.0.6
Merge branch 'master' of git://github.com/eedrummer/devise_oauth2_providable into mongoid-3

Conflicts:
	devise_oauth2_providable.gemspec
	lib/devise/oauth2_providable/expirable_token.rb
	spec/dummy/app/models/user.rb