After what happened to him with the Governor and then Joe, Rick is just stepping up his game to avoid any more traps.
That was a part of the episode that I didn't get. He was cautious enough to bury weapons but not cautious enough to leave Darryl or Michone behind until they found out everything was safe. That would have lent a lot more credence to his "messed with the wrong bunch" line than people hoping that Carol and Tyreese wouldn't walk in just as oblivious to Rick's plight as Rick was to Glenn and the other bunch.
A good starting place for the next season would be Carol and Tyreese being close to Terminus and hearing all of the automatic weapons fire, and that will raise red flags for them. After hearing all of the shots, they could have sneaked around the perimeter while the Terminus people were distracted, and saw the railroad car Rick and the others were forced into. Lots of ways they could go with it when they pick it back up. No matter what, I expect some of the main characters to escape, while others won't make it out and will remain captive. The ones that escaped will regroup and work on rescuing the others. To me, that would seem to be the easiest way to lead off the next season anyway, but who knows. Even the writers may not completely know themselves at this point.
FWIW, with author errors in episode description:http://nypost.com/2014/03/31/walking-dead-needs-to-do-more-to-keep-viewers-interested/?utm_source=Sailthru