If you're going to keep people and your gear inside your tent, consider factoring in an extra person. There are some 2 person tents that you've got to be *ahem* rather cozy with your tent mate, which may or may not be a good thing.
If you keep most of the stuff in the vestibule, then you should be fine.