Fish: Ported right prompt
Moved ag alias to a different section
Fish: Addded aliases
Tmux: Ts stream command is still somewhat broken with ruby 2.0.0
Vim: Do not wrap git commit messages
Use the diff3 style for merge conflicts
Fish: Added mkcd function
Removed placeholder
Fish: Fixed unnecessary bug.
Update ruby-build
Fish: Updated folding
Removed obnam configuration
Zsh: Renamed collapsed pwd to prompt_pwd