Lots of stuff, honestly
Some vim and tmux improvements
JSON indent, smartcase for search
Merge remote-tracking branch 'origin/ubuntu' into cygwin

Conflicts:
	.vimrc
	.zshrc