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
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
# This is a combination of 18 commits.
# The first commit's message is:
Update prezto (+41 squashed commits)
Squashed commits:
[d3b386d] merged
[dd94bc4] update gitconfig
[9162943] Update gitconfig source tree path
[4f8fb74] Update prezto
[6f953e6] 競合を解決
[1cd4b3d] 色々修正
[2fe92a3] カスタムprompt preztoへ
[8a906c1] Disable alias that already defined in prezto
[a215e99] merge gitconfig, gitignore from dotfiles, yadr, dotfiles_mathiasbynens
[d553ad0] Update gitconfig
[daf502d] Change zsh theme
[eb0c670] Edit Rakefile
[d9428f8] Enable ruby prezto module
[12892ad] いらないoverrideはコメントアウト
[efac565] Customize prompt
[864ce59] zpreztorc (override) をpreztoと統合． install.shを変更しDropbox内にcloneするようにした．
[078d80b] Update prezto, gitconfig was auto-modified by SourceTree.app
[6f5ace7] Update prezto
[45dd355] Rakefileをオリジナルのものに変更
[a46a9c8] Change prezto repo to ay65535/prezto
[237ede0] Update install.sh
[3db0852] Update gitconfig source tree path
[e079afb] Update prezto
[e5236eb] 競合を解決
[eb281cd] 色々修正
[e21fc2a] カスタムprompt preztoへ
[b2a29a6] merge gitconfig, gitignore from dotfiles, yadr, dotfiles_mathiasbynens
[07bc28e] Update gitconfig
[0b59f35] Change zsh theme
[471f971] Edit Rakefile
[e8f16f4] Enable ruby prezto module
[0033d97] いらないoverrideはコメントアウト
[ca3089e] Customize prompt
[59b06e9] Update README.md
[574068c] zpreztorc (override) をpreztoと統合． install.shを変更しDropbox内にcloneするようにした．
[8e4e901] Update prezto, gitconfig was auto-modified by SourceTree.app
[1c1439c] Change prezto repo to ay65535/prezto
[44ea567] Update README.md
[cef0231] Update README.md
[ad26237] Update install.sh

自分のリポジトリを指すようにした。
[bbba635] 最小限の変更

Add name and email into gitconfig
Add some aliases
Use emacs key bindings in zsh

# This is the 2nd commit message:

Update prezto, gitconfig was auto-modified by SourceTree.app

# This is the 3rd commit message:

zpreztorc (override) をpreztoと統合． install.shを変更しDropbox内にcloneするようにした．

# This is the 4th commit message:

Customize prompt

# This is the 5th commit message:

いらないoverrideはコメントアウト

# This is the 6th commit message:

Enable ruby prezto module

# This is the 7th commit message:

Edit Rakefile

# This is the 8th commit message:

Change zsh theme

# This is the 9th commit message:

Update gitconfig

# This is the 10th commit message:

merge gitconfig, gitignore from dotfiles, yadr, dotfiles_mathiasbynens

# This is the 11th commit message:

Disable alias that already defined in prezto

# This is the 12th commit message:

カスタムprompt preztoへ

# This is the 13th commit message:

色々修正

# This is the 14th commit message:

競合を解決

# This is the 15th commit message:

Update prezto

# This is the 16th commit message:

Update gitconfig source tree path

# This is the 17th commit message:

update gitconfig

# This is the 18th commit message:

merged
Update prezto
Fix gitconfig and gitignore
This is an original version of Rakefile (upstream/master)
Update prezto
Update gitconfig
Update sorcetree path
git config --global push.default matching
Update prezto
Update prezto
Update prezto