Remove newline prompt command, concatenate `$PS1`
Improve `branch_if_repo` conditional

This allows sub-directories of Git repositories to return the current
branch name.