* Merge deployment and development Dockerfiles * Stop using root to install dependencies * Run make commands from os with --user olympia