HUGE pull 

This contains my map, as well as all the latest bay12 code.