add tool for resolving svn merge conflicts
add gitconfig
handy tailing helpers

tailall allows you to automatically get a bunch of logs. you can also
give it a list of logs to tail. saves a bit of time

tailpipe is nice for colorizing. it also pretty prints python objects