Update repository to Carthage 0.4
Fix project/workspace references to checkouts
Merge pull request #7 from Carthage/carthage-0.4

Update repository to Carthage 0.4