Added ack.vim
Fixed merge conflicts