PUMP-wise you should buy a Joe Blow pump. They're great.
http://www.topeak.com/products/Floor-Pumps/JoeBlowSport
Bike-wise I'd look on craigslist. You can often get more for your money than going to some store and getting a new bike. "Vintage" is also likely to mean "heavy" w/ the frame, if you're OK with that. I have a road bike with an 80s steel frame which is heavier than newer bikes but I just work with it.
Personally when I buy a new (used) bike I replace a lot of the components to fit my personal preferences. For $800 you should definitely be able to get a sweet ride. Id' recommend putting "no-flat" tires on them. I currently have Schwalbe tires and have had them on for a year and a half without ONE SINGLE FLAT TIRE!!! They are great!
http://www.schwalbetires.com/marathon_plus