Makefile cleanups, fix template problem in container-start.
Merge branch 'dev' of https://github.com/browndav/medic-os into dev