Merge pull request #1 from yanyaoer/master

switch airline & indent-line
Merge remote-tracking branch 'upstream/master'
link config.fish
fix fish alerady link
Merge pull request #1 from nealnote/fish

link fish config