FIX: Improved phing translations-mergeback

 - Show the diff when asking for confirmation to commit it.
 - Fixed a bug in the pushing back to origin
 - Check out and pull the branch that you were working with, rather than checking out master (which may or may not exist)