Specify email so Git doesn't freak out
Merge pull request #636 from drkitty/fix-tests-again

Specify email so Git doesn't freak out