Pull feffio updates (credit: Alan Dozier).
Cleanup of feffio.