Merge pull request #81 from CounterpartyXCP/develop

Develop
more cleanup
Merge branch 'docker' into develop