VIM exit in ZSH works, removed typo in aliases.zsh
Merge remote-tracking branch 'origin/master'

* origin/master:
  Fix solarized easymotion in terminal vim
  Moving ./osx to ./bin/osx
  Adding shell script to fix MacVim bug with external displays
  VIM exit in ZSH works, removed typo in aliases.zsh
  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