Update contributing docs and add commit squash instructions
Merge pull request #1602 from alexgibson/add-rebase-contributor-instructions

Update contributing docs and add commit squash instructions [no bug]