fix up the boost install script
Merge remote-tracking branch: upstream/master