Revert "Forked SiriProxy-XBMC from brainwave9 for customization."

This reverts commit 464a6c8ac09c52c70784a11ace0b53cb9abe02ac.
Fixed test method for now.