Implement composite masks and mask logic
Add test for apply_mask and fix issues
Merge pull request #44 from astrofrog/composite-masks

Implement composite masks and mask logic
minor fixes and convenience functions