Updated kitchens and baths are most generally sound investments, particularly when you're able to accomplish a renovation within a reasonable budget. When making renovations with an eye for resale within the near future, 'clean' and 'generic' should be kept in mind. Keep your lines clean and your permanent colors generic. Walls can be painted, wallpapered or decoratively enhanced to draw interest. Changing a floor plan requires a bit more thought and planning - what are you looking to accomplish with the change - more living space? less formality? Does the renovation suit the house?
Most buyers want to personalize their new home - starting with a basic, updated foundation is a huge plus. At any rate, you can enjoy the enhanced space while you market your home - and I believe that is a good goal!