ackrc: added filetypes for jade and yaml
gitconfig: added prompt = false for difftool and mergetool config, added keepBackup = false to mergetool config
updated a couple of git aliases