Adds a git alias to easily merge squash subtrees.
Don't load bash-ido.
Adds more file types for stripping trailing whitespace.
Sort git aliases.
Merge branch 'master' of github.com:gorakhargosh/dotfiles