Adding git grep and updating aliases.
Adding Go path.
Merge branch 'master' of github.com:beardedprojamz/DotFiles

Conflicts:
	.bashrc