Merge branch 'autoload_application'

Conflicts:
	lib/combustion.rb
Merge branch 'load_combustion_initialization_with_rails_hook'