Merge pull request #3422 from eileenmcnaughton/test_fixes
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Jun 2014 22:43:05 +0000 (10:43 +1200)
committerEileen McNaughton <eileen@mcnaughty.com>
Tue, 3 Jun 2014 22:43:05 +0000 (10:43 +1200)
Test fixes & a few minor tidy ups, fix mail_settings in particular


Trivial merge