Sorry I don't mean to bump an old thread, I just wanted to post what ended up being wrong. I took it in to a local shop and they found that the idle control motor was stuck too high, so they replaced it and now it's running fine.