iPhone 4S over iPhone 4: Should I stay or should I go?

A lot of people are wondering which iPhone is the right one for them - both people looking to upgrade their own one and people who are just joining the Apple phone party. How much more do you get with the 4S, over the iPhone 4? If you're wondering just that, we're here to help by putting the two...