Remove grunt setup:branch in favor of doing merges manually