In the end, I went with a Blackburn Mammoth Mountain frame Pump that they are attaching to my bike along with everything else, and a dedicated Blackburn floor pump for my apartment. The head bike mechanic, my cycling instructor, and a couple of others convinced me that this would work better for me in the long-term

I did purchase the bike today, but I don't get to bring it home until Sunday afternoon. I couldn't stick around for them to attach everything to the bike (bottle cage/pump/lights/etc), and I am traveling tomorrow - so it will be Sunday afternoon. However, that is only the day after tomorrow - and I will get a picture when I bring my beautiful new steed home!