rename
fix file cleanup
Merge pull request #118 from TheDistractor/0.9.x

Almost same as yesterdays pull
cleanup, io/ iso if/
Merge branch '0.9.x' of github.com:jcw/housemon into 0.9.x