more Makefile and small dockerfile refactoring
adding no-cache back to makefile
Merge pull request #114 from jamonation/master

Makefile update