Jensen clarified at JIBCon today that the hug was scripted but that it was more of a light hearted, quick hug rather than the more poignant one they ended up with. You can read what they said about it in the panel summary I posted from sammyhale.

The guys usually end up interpreting a scene like that the way they think their characters would react, thank goodness. We're lucky to have them.