add fish/salt bundle
merge origin master