Always use --no-ff to merge feature branches regaredless of commit count...

This fixes an issue where single commit feature branches are not merged --no-ff and thus we lose valuable metadata.

Please see issue #292 for further details.