Added snippet integration
Merge branch 'master' into work
Really need a way to prevent that particular line from being clobbered on update...
Merge branch 'master' into work
Merge branch 'master' of github.com:aspidites/dotfiles into work
Added copy/paste
updated settings
re-enabled tmux and rxvtc
back to oh-my-zsh