Remove merge tag
Included recommended defaults for FreeBSD in the README.
metadata.rb already says this recipe supports FreeBSD.
Fix foodcritic message:
Use single-quoted strings as hash keys instead of symbols.
Merge branch 'fix-freebsd' into cdmaster