Cool, I hope you're enjoying your new machine.
Huey make colour calibration hardware/software:
http://www.pantone.co.uk/pages/products/product.aspx?pid=79&ca=2&s=0
There is a basic version and a pro version - both do the same thing, but the pro allows you to calibrate two monitors connected to the same machine (eg when a monitor is connected to a laptop) and get them looking as near the same colour and contrast as possible to each other. If all your computers only ever have one screen then the basic version is all you need. Huey as a company is in no way related to Adobe and Photoshop, so I'm afraid there are no discounts available for owning one or the other already.
Ever since I got one of these calibrators, I've never had to worry about what colours I'm going to get back from the printers. Also, if you email stuff off to someone and they complain about the colours, you can confidently say their screens are out and that your shots are fine!
