Moving in some stuff from songbook-core
Merge pull request #1 from patacrep/next

Moving in some stuff from songbook-core