More enhancements (from ack.vim)