Replacing search

Replacing silver searcher for git grep as global search.
Ignoring DS_Store
Merge branch 'master' of github.com:socketwiz/dotfiles

Conflicts:
	.gitignore