Cleanup: remove our own copy of iniparse

Rather use upstream iniparse and subclass in future if we need to
correct any issues.
makephaselist should sort consistently