Update for latest rustc (0.9 9dece60)

.map_default() is now called .map_or()