Separate set_auto_scale() and set_auto_mask() methods

This is the pull request for #266.

One should add tests for the two new functions. Is there a reason that you have two files with tests for the masking? 

Thanks for considering,

   Chris.