Merge pull request #361 from ZeusWPI/fix/361/fix-mailers

Mailers are broken because the organisation attribute is gone
Merge branch 'master' of github.com:ZeusWPI/Gandalf