Merge pull request #1279 from MatthewVita/local_development_docker