Mangling reinstated after refactoring broke it.
Merge branch 'master' of github.com:CocoaPods/cocoapods-packager

Conflicts:
	lib/builder.rb