Make music directory optional
Update music submodule