Add spk files, and update compose.py for mail implementation changes.
Merge pull request #1 from kentonv/sandstorm-master

Add spk files, and update compose.py for mail implementation changes.