Force git to fast-forward on pull, add MATLAB to EOL-whitespace-fix