added iterm and fish_prompt stuff
merged master into latest