Add shellcheck bash linter
use p4merge for mergetool and difftool
Merge branch 'master' of github.com:bdashrad/dotfiles