Started simplifying container stuff
Remove commented out line
Use CMD instead of ENTRYPOINT so it can be overriden more naturally