mako updates
removed merge trash
fuji: switch to prebuilt GPS
use Sony DASH