Fix docker name, and config file
Merge branch 'development' of github.com:twoflowers/vUp into development