Fix small issues
Merge branch 'master' of https://github.com/jmccrae/nimrod
Update phrase extractors
Update phrase extract