changes from captbaritone
Merge branch 'master' of github.com:veltzer/openbook

Conflicts:
	src/jazz/lost_in_the_stars.mako