vim: update Ack command to use ag
git: add show-conflicts alias
vim: update wildignore