Switch to parser branch
Fix diffput/diffget abbreviations