Modified setings of lightline to match the README in the lightline project Added indication of paste mode, added functions instead of code in call of components, added git branch glyph, added path to file being edited
Update vim enhancements README with Lightline
Make tmux split exactly 50%
Update aliases.zsh

Adding :q to exit your shell
Merge pull request #569 from adamenger/patch-1

Add :q to exit shell
Merge pull request #565 from ianks/tmux-split

Make tmux split exactly 50%
Merge pull request #564 from timstott/update_documentation

Update vim enhancements README with Lightline
Adding shell script to fix MacVim bug with external displays

(cherry picked from commit 479a0b5b714805218fa16ed91446d19bbebffcfd)
Moving ./osx to ./bin/osx
Merge pull request #571 from lfilho/move-osx-bin

Moving ./osx to ./bin/osx
Merge pull request #570 from lfilho/fix-macvim-external-display

Adding script to fix MacVim bug with external displays
Merge pull request #562 from jby/new_lightline_settings

Modified setings of lightline to match the README in the lightline project
Fix solarized easymotion in terminal vim
Fixed tmux.conf syntax
Merge pull request #575 from jby/fix_tmux_conf_syntax

Fixed tmux.conf syntax after PR #565
Remove orphan vim settings for LustyExplorer plugin
Merge pull request #582 from timstott/remove_stale_plugin_settings

Remove orphan vim settings for LustyExplorer plugin
Merge in remote YADR changes.

* upstream/master:
  Remove orphan vim settings for LustyExplorer plugin
  Fixed tmux.conf syntax
  Fix solarized easymotion in terminal vim
  Moving ./osx to ./bin/osx
  Adding shell script to fix MacVim bug with external displays
  Update aliases.zsh
  Make tmux split exactly 50%
  Update vim enhancements README with Lightline
  Modified setings of lightline to match the README in the lightline project Added indication of paste mode, added functions instead of code in call of components, added git branch glyph, added path to file being edited