Great guide, saved me a lot of digging. Just a note that I had to modprobe from / and use sudo to get the new module to load. Otherwise spot on.

I also added both repositories for Bumblebee and Edgers and had the problem of not being able to install bumblebee becuase of a broken dependency on nvidia-current. I fixed that by ppa-purging the Xorg-Egers repository and picking up at the start

sudo apt-get install ppa-purge