Updates to XBMC and ZWave