Updating my prompt
Merge branch 'master' of github.com:chrismcmacken/fish_config