Merge branch 'colors' of https://github.com/bpartridge/vexflow into bpartridge-colors

Conflicts:
	.gitignore
	src/stavenote.js