Merge pull request #103 from pnorman/mapdust_disable