Use ack instead of grep
Fix current branch function