default to --no-ff on merge
Enable fasd plugin & change depr. brew setting