Rebase and squash before merging PRs

[Jared Stewart]

I’ve been seeing a lot more merge commits on develop since we moved to Gitbox.  
Just wanted to give everyone a friendly reminder to please rebase before 
merging to keep our git history tidy and readable.

Thanks,
Jared