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

Fuji: make carriage returns optional (rebased onto develop)