Split oh-my-zsh plugins to separate lines
zshrc: set TERM=xterm-256color if we have a DISPLAY
Merge branch 'master' of github.com:mattjbray/dotfiles

Conflicts:
	.zshrc
zshrc: Add plugins

bundler, fabric, node, npm, pip, python, rails3, rails4, rake, rsync,
ruby, tmux, virtualenv, vundle
zshrc: Allow deletion past insertion point