Merge pull request #99 from mcr/master

KLIPS and confread changes
Ubuntu has backported some code to 3.13, so use correct select code