I found that simply removing the Chinook repo and leaving the Diablo repo was all I needed to do. After that, I just ran Canola cleaner and installed Canola2 and the Tuning plugin as normal from the application manager (no need to fool with root or apt-get).