Bump version number
Add a method to combine two Cartfiles
Load and consider Cartfile.private, if it exists
Move Quick, Nimble, xcconfigs to Cartfile.private
Explain Cartfile.private in the Artifacts document
Migrate HelpCommand to Commandant
Merge pull request #247 from Carthage/private-cartfile

Cartfile.private
Merge remote-tracking branch 'origin/master' into 0.5-development
Merge pull request #240 from Carthage/0.5-development

0.5: Pit of Loneliness
Merge branch 'master' into extract-entry-point

Conflicts:
	Cartfile
Merge branch 'extract-help-command' into extract-entry-point

Conflicts:
	Cartfile.resolved
	Carthage/Checkouts/Commandant