fixed indentation
fixed indentation again
Merge branch 'master' of github.com:fionakhatana/mongoid-paranoia

Conflicts:
	lib/mongoid/paranoia.rb
	spec/app/models/parent.rb
	spec/mongoid/paranoia_spec.rb