Changed import directives to reflect modifications in the swiffe package.
Moved the intersect method into macs.py