If you really like folk-rock, I highly highly highly recommend Josh Ritter. He's a bit more folk than rock, but his songwriting is amazing. (He's been compared to Bob Dylan, and Joan Baez covers one of his songs on her most recent album.)

I'm going to try to see him on April 5 when he's in San Francisco.