merge conflicts

.gitignore

.travis.yml

Dockerfile

Godeps/Godeps.json

Godeps/Readme

Godeps/_workspace/.gitignore

Godeps/_workspace/src/bitbucket.org/kardianos/osext/LICENSE

Godeps/_workspace/src/bitbucket.org/kardianos/osext/osext.go

...orkspace/src/bitbucket.org/kardianos/osext/osext_plan9.go

...rkspace/src/bitbucket.org/kardianos/osext/osext_procfs.go

...rkspace/src/bitbucket.org/kardianos/osext/osext_sysctl.go

...workspace/src/bitbucket.org/kardianos/osext/osext_test.go

...kspace/src/bitbucket.org/kardianos/osext/osext_windows.go

Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/LICENSE

Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/dce.go

Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/doc.go

Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/hash.go

Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/node.go

Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/time.go

Godeps/_workspace/src/code.google.com/p/go-uuid/uuid/util.go