removing deprication warning
Merge branch 'master' into mongoid-support

* master:
  removing deprication warning

Conflicts:
	lib/delayed_paperclip.rb
	lib/delayed_paperclip/attachment.rb