Fix some merge issues, some compilation issues, and complete Pawn's getMoves() (minus en-passant)