Merge pull request #1 from alexcrichton/remove-locks

Remove locked revisions from the manifest
Update for r2d2 change
Add has_broken
Take mutable references
Temp switch to alexcrichton