Merge in latest changes from develop including docker build #115

Closed lawrencedudley closed 6 years ago