Fixed an issue that flattened a multi-line custom prompt into a single line, and cleaned up the prompt prefixing behavior
Merge pull request #353 from ryanartecona/develop

Cleaner fish prompt-switching behavior