I'd prefer both as the default as well. We allow our developers to choose between using forks or doing branches within the main repo.