Merge my new version plz?!? :)

Faster, better, horrible race conditions (that resulted in totally the wrong code being checkout out) removed etc - lots of changes..

Should be pretty compatible with what you're running (although may need a couple of settings tweaks?)