Quick refactoring
Fish prompt: display working dir in full
Updated README