Better formating for marks.

Cherry-picked 50d124f from 4dma/dotfiles

Conflicts:

	bash_custom