diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0a3e54027e7db2603733b0ee26879cd7561cdbc6..221d2d0aac84a2917744bf790d889f1af119574f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,7 +3,7 @@
 2. Make your changes.  If you are adding an endpoint or resource to the API,
 follow "Adding an API Resource"
 3. Make sure your code follows the "Code Standards" section of this document
-4. Use "git rebase -i" to squash your commits into one or a few. Follow commit message guidelines.
+4. Use "git rebase -i origin/master" to squash your commits into one or a few. Follow commit message guidelines.
 5. Push your feature branch and make sure Travis CI passes
 6. Submit a pull request to master and tag at least one reviewer
 
diff --git a/bin/runtests.sh b/bin/runtests.sh
index 5c2868d2b61907ded36c1e964b6286a3e5253a39..de74195d62f937cce2693c6a730774538f53c25f 100755
--- a/bin/runtests.sh
+++ b/bin/runtests.sh
@@ -77,7 +77,12 @@ case "$1-$2" in
       run \
       --rm \
       --entrypoint "newman run /usr/src/tests/postman/integration_tests.postman_collection -e /usr/src/tests/postman/environments/travis-ci.postman_environment" \
-      integration-test ||
+      integration-test &&
+    echo "Checking number of files with DOS encoding:" &&
+    ! find * -type f -exec file {} \; | \
+      grep -I "with CRLF line terminators" &&
+    echo "Checking for files with windows style newline:" &&
+    ! grep -rI $'\r' * ||
     # set failure exit code in the event any previous commands in chain failed.
     exit_code=1