Consolidate dockerfile commands re #204
Add roadmap
Merge branch 'master' into 1_4_refactor