I'm with sixtofour, once you don't have to think about what to do, you speed up massively. Personally I prefer vi only because I've learnt it. Changing slows me down for very little gain.

For me, vi + git + make works well. Have tried most IDEs and keep coming back to this combination. Use a second screen to refer to APIs etc.