Fuji: make carriage returns optional
Merge pull request #776 from melissalinkert/fuji-line-endings

Fuji: make carriage returns optional