added vocab function and span
Merge branch 'newformat' of http://github.com/bootstrapworld/curr into newformat