mikebridge.ca from default
Merge branch 'master' of github.com:mikebridge/docker