thug - Dockerfile changes

Moved to single blocks of commands to work on layering issues. Adding flags and corrections from private.