lib/papermill.rb in papermill-1.1.2 vs lib/papermill.rb in papermill-1.1.3

@@ -6,15 +6,11 @@
 Hash.send :include, PapermillHashExtensions
 File.send :include, PapermillFileExtensions
 String.send :include, StringToUrlNotFound unless String.instance_methods.include? "to_url"
 Formtastic::SemanticFormBuilder.send(:include, PapermillFormtasticExtensions) rescue NameError
 
-begin
-  require File.join(RAILS_ROOT, "config/initializers/papermill.rb")
-rescue LoadError
-  require 'papermill/papermill_options.rb'
-end
-
+require 'papermill/papermill_options.rb'
+require File.join(RAILS_ROOT, "config/initializers/papermill.rb") rescue LoadError
 require 'paperclip' unless defined?(Paperclip)
 require 'papermill/papermill_paperclip_processor'
 require 'papermill/papermill'
 require 'papermill/papermill_asset'
 require 'papermill/form_builder'