Merge remote-tracking branch 'origin/master'
Fix C comments
Comments and stuff in tmux config
List tmux sessions when starting zsh login shells
C and Python ftplugin tweaks
Add C++ to mkcodemod
Add some Markdown settings to vim/after/ftplugin
Tweak some Vim macros for sourcing and editing configuration files
Set filetypes with autocmds (I think these will be fixed by some syntax scripts)
Reload snippets after writing a snippet configuration file
Merge remote-tracking branch 'origin/master'

Conflicts:
	tmux.conf
	vimrc