Fixed and improved OpenSong import
Merge branch 'master' of github.com:openscriptures/BibleOrgSys after working from laptop