Update Smyth.
Fixed merge conflicts.
Update Smyth references.
Merge branch 'master' of github.com:OpenPhilology/phaidra