This cleans up the templates a little to make them more consistent. Also
fixes the bug fix link pattern so it matches what is expected for GitHub
to automatically link and close issues with the PR.
Signed-off-by: Sean McGinnis <smcginnis@vmware.com>