Tidying up contributing page
Reorganized merging to reflect the differences b/w merging and Pull
Requests