Merge branch 'stable-paths'

Conflicts:
	moonshine/bitimage.py
	moonshine/staves/path.py