revert changes for maverick, and move it to mavericks branch
use 2.0-M contrib directory, as not compatible due to maverick changes
change SConscript for 1.2
merge 2.0