Switch to ag, the_silver_searcher
Merge remote-tracking branch 'origin/master'