made mask generation saner.
fix to masks.
Merge branch 'master' of github.com:dlwh/puck