Improved data import
Fixed scale interactions
Merge branch 'scale' of github.com:unepwcmc/MacarthurWatersheds into scale