Quick update to contributing file for merge/rebase actions to keep up to date a repo.

Signed-off-by: Norv <a.w.norv@gmail.com>
Merge pull request #119 from norv/contributing_update

Quick update to contributing file