Arduino Mega and Wifly shield
Ok, more information here ( http://mcukits.com/2009/04/06/arduino-ethernet-shield-mega-hack/ ). Even though this is for Ethernet, I have to do the same thing with the WiFly module and rewire the pins.