Bam Margera Takes Deal in Trespassing Case, Probation Extended