Cleanup, tweak some aliases, add 10-line context grep
Better alias definitions