remove deprecated stuff
Fixed tests and docs
Merge pull request #599 from chrisfilo/temp_fix/automask

Temp fix/automask