bash: fix how we put the terminal into normal mode

Putting it into PS1 was causing the cursor to be off in position in
certain circumstances (going back in history, and then coming forward,
for example).  Putting it it PROMPT_COMMAND avoids the issue.