work stuff
gitconfig
Merge branch 'master' into work

Conflicts:
	bin/tmux-detach-others
Merge remote-tracking branch 'origin/work' into work
moved to devscripts
change work path a bit
better virtualenvwrapper support
periodic commit
merge from master
stuff.
svn-diff / vimdiff integration
move my work bashrc to separate file
(some) clojure syntax support
`hostfrom`: a command to show the host you've just logged in from
several months worth of little fixes
puppet syntax support
tool to prune merged git branches
merge from master
merge from work
merge from origin/master