work-related aliases etc
better find function
Merge branch 'master' of https://github.com/JonathanReeve/dotfiles
tweak grep, add aliases
Merge branch 'master' of https://github.com/JonathanReeve/dotfiles

Conflicts:
	.bashrc