Cleaning out some carriage returns from the github-merge script
Merge pull request #1129 from modcloth/clean-out-some-carriage-returns

Cleaning out some carriage returns from the github-merge script