Cherry pick a few things
Merge branch 'running' of github.com:pmatis/misterhouse into running