Discard pile and shuffling question
You include the card you just gained when re-shuffling.  There is only one discard pile.

Cards that are set aside or revealed do not get re-shuffled until they are placed in the the discard pile as specified by the specific card.

Quotes from the rulebook:


  "Gain” – when a player gains a card, he takes the gained card (usually from
  the Supply) and puts it onto his Discard pile (unless the card says to put
  it elsewhere). The player does not get to use the card when he gains it.





  A player places cards he Buys or otherwise acquires during the
  game on his Discard pile unless he is specifically directed to place
  them elsewhere.