link to p4merge what's good for merging stuff
handy hipchat bashy-curl
first cut at shaws
more generic dotfile loc
bash completion for fabric and shaws