update
Merge branch 'master' of github.com:gogozs/dotfiles

just merge
Merge branch 'master' of github.com:gogozs/dotfiles
Merge branch 'master' of github.com:gogozs/dotfiles

merge from OSX
update
Merge branch 'master' of github.com:gogozs/dotfiles

merge from osx
add host-song_linux
Merge branch 'master' of github.com:gogozs/dotfiles