Merge pull request cloud66-oss#22 from cloud66/dev

update dockerclient to work with docker 1.12

broken link in readme

Merge branch 'dev' of github.com:cloud66/habitus

Merge branch 'master' of github.com:cloud66/habitus

# Conflicts:
#	main.go

Merge branch 'dev' of github.com:cloud66/habitus

Merge branch 'dev' of github.com:cloud66/habitus

# Conflicts:
#	main.go

Merge branch 'feature/ssh_server' into dev

Merge branch 'master' of github.com:cloud66/habitus into dev

new file format

allow running of commands