Mark bin/traceur.js as binary

And when there are merge conflicts use theirs