Just some more suggestions Bryan:

1) What is your current idle speed set at when idling, and what does it drop to when you put it in gear?
2) Check all of your lines and make sure you don't have a vacuum leak somewhere.

Just start with the easy stuff before you look into the more serious issues.