Update Psych

Rebase off latest upstream master.

@burke @andrewdunbar