update local gregdek repo with vic's changes

...and throw away my own :)