If you want to get the buttons back onto the right hand side on the windows use:
tim@laptop:~$ gconftool-2 --set /apps/metacity/general/button_layout --type string menu:minimize,maximize,close
This is for 10.10 which I just dual booted on the laptop.