Ignore dirty submodules.
Removing oh-my-zsh so I can turn it into a submodule.

Conflicts:
	.oh-my-zsh/README.textile
	.oh-my-zsh/lib/aliases.zsh
	.oh-my-zsh/lib/directories.zsh
	.oh-my-zsh/lib/functions.zsh
	.oh-my-zsh/lib/termsupport.zsh
	.oh-my-zsh/oh-my-zsh.sh
	.oh-my-zsh/plugins/archlinux/archlinux.plugin.zsh
	.oh-my-zsh/plugins/aws/aws.plugin.zsh
	.oh-my-zsh/plugins/battery/battery.plugin.zsh
	.oh-my-zsh/plugins/brew/_brew
	.oh-my-zsh/plugins/bundler/bundler.plugin.zsh
	.oh-my-zsh/plugins/emoji-clock/emoji-clock.plugin.zsh
	.oh-my-zsh/plugins/gem/_gem
	.oh-my-zsh/plugins/git-prompt/gitstatus.py
	.oh-my-zsh/plugins/git/git.plugin.zsh
	.oh-my-zsh/plugins/jira/jira.plugin.zsh
	.oh-my-zsh/plugins/mvn/mvn.plugin.zsh
	.oh-my-zsh/plugins/node/node.plugin.zsh
	.oh-my-zsh/plugins/pass/_pass
	.oh-my-zsh/plugins/rake-fast/rake-fast.plugin.zsh
	.oh-my-zsh/plugins/rvm/rvm.plugin.zsh
	.oh-my-zsh/plugins/sublime/sublime.plugin.zsh
	.oh-my-zsh/plugins/symfony2/symfony2.plugin.zsh
	.oh-my-zsh/plugins/tmuxinator/_tmuxinator
	.oh-my-zsh/plugins/vagrant/_vagrant
	.oh-my-zsh/plugins/wd/README.md
	.oh-my-zsh/plugins/wd/_wd.sh
	.oh-my-zsh/plugins/wd/wd.plugin.zsh
	.oh-my-zsh/plugins/wd/wd.sh
	.oh-my-zsh/plugins/web-search/web-search.plugin.zsh
	.oh-my-zsh/plugins/zsh_reload/zsh_reload.plugin.zsh
	.oh-my-zsh/themes/bureau.zsh-theme
	.oh-my-zsh/themes/fino.zsh-theme
	.oh-my-zsh/themes/half-life.zsh-theme
	.oh-my-zsh/themes/pygmalion.zsh-theme
	.oh-my-zsh/tools/check_for_upgrade.sh
	.oh-my-zsh/tools/install.sh
	.oh-my-zsh/tools/upgrade.sh
Added .oh-my-zsh as a submodule.

Conflicts:
	.vim/.netrwhist
Volume controls, using Page Up, Page Down, and Home for up, down, and
mute, respectively.
Ignore .netrwhist file.
Removed unused entries from .i3 config.
Initted .oh-my-zsh submodule. ??
Merge branch 'master' into other

Conflicts:
	.gitignore
	.i3/config
	.oh-my-zsh