My first gen 8GB phone was jailbreaked and unlocked on 2.0.2 and I just upgraded to 2.1 and it remains unlocked. joy!
EDIT: My email doesnt work... I open it, and it crashes. It was this way before the update... I thought the update might fix it. Any thoughts? It wont let me delete the email account...
Thats a known bug from 2.x firmwares. You need to wait until a new PwnageTool/QuickPwn is released so that you can jailbreak it.
Once you've done that you can download "bossprefs" via cydia. This has an option to "fix directory permissions", which will solve this problem.