Make sure we don't add extra EOLs - fixes #711
Merge pull request #712 from mozilla-services/issue-711

Make sure we don't add extra EOLs - fixes #711