the rest of the merge conflict...
the rest of the merge conflict...

ldecicco-USGS/vizlab,USGS-VIZLAB/vizlab,lindsaycarr/vizlab,USGS-VIZLAB/vizlab,aappling-usgs/vizlab,USGS-VIZLAB/vizlab,lindsaycarr/vizlab,ldecicco-USGS/vizlab,aappling-usgs/vizlab,lindsaycarr/vizlab,aappling-usgs/vizlab,ldecicco-USGS/vizlab