Make addBuildsetsForSourceStampsWithDefaults do what it says
fix trigger tests
pep8
Merge pull request #1360 from djmitche/abs4sswd

Make addBuildsetsForSourceStampsWithDefaults do what it says