Merge pull request #113 from jamonation/master

Makefile for docker builds
more Makefile and small dockerfile refactoring