Squashed 'vendor/src/github.com/openshift/docker-source-to-images/' changes from e9c3e8a..cdf5c23

cdf5c23 Merge pull request #51 from pmorie/lockl
86dac49 Remove file lock
55c845e Merge pull request #50 from pmorie/local
9ae268e Add git local protocol support

git-subtree-dir: vendor/src/github.com/openshift/docker-source-to-images
git-subtree-split: cdf5c23c2825504bc4c3315f183a57b491907047
Merge commit 'a1274cc90ca42a6441899ea5e73956fa6239a734'
Make integration tests more resilient
Remove use of docker.GetContainer
Merge pull request #101 from pmorie/vendor-sti

Vendor sti
Merge pull request #102 from smarterclayton/more_integration_resilience

Make integration tests more resilient
Update geard demo script to work with new version of the broker image
Merge pull request #103 from jwforres/update_demo_script

Update geard demo script to work with new version of the broker image