Using grep instead of ack and added magit for git