Make circular dependency detection log message Trace level
fix whitespace
refactor
Implement inheritance of an initializer by a child, unless overridden.
Remove noisy loggin.
Tidy up.
Tidy up.
rename tests
narrow parameter
clarify parent inheritance tests
Merge branch 'definition-inheritance'

Conflicts:
	Source/Factory/InstanceBuilder/TyphoonComponentFactory+InstanceBuilder.m
	Tests/Factory/Block/TyphoonBlockComponentFactoryTests.m
	Tests/Pods/Pods.xcodeproj/project.pbxproj
	Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-iOS Tests (Cocoapods)-OCHamcrest.xcscheme
	Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-iOS Tests (Cocoapods)-OCMockito.xcscheme
	Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-iOS Tests (Cocoapods)-Typhoon.xcscheme
	Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-iOS Tests (Cocoapods).xcscheme
	Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-ios-OCHamcrest.xcscheme
	Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-ios-OCMockito.xcscheme
	Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-ios.xcscheme
	Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-osx-OCHamcrest.xcscheme
	Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-osx-OCMockito.xcscheme
	Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-osx-Typhoon.xcscheme
	Tests/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-osx.xcscheme
	Tests/Tests.xcodeproj/project.pbxproj
update podspec.
Merge branch 'factory-provider' of github.com:drodriguez/Typhoon

Conflicts:
	Tests/Tests.xcodeproj/project.pbxproj
Merge #101
Update README.md
update code style
remove extra, unusued MiddleAgesAssembly instance
Add .gitattributes

Attempt to handle .pbxproj merge conflicts by including both sides of the changes.
Simplify locating bundled resources. Add test coverage for resources without extensions.
Simplify Definition Inheritance tests.