Docker

Needs a bit more testing (and rebase) before merging, but it seems to work.