merging conflicts.
add .gitconfig.local to gitconfig, if it exists.
add vimoutliner
add aliases file, for common aliases.
some default windows, and scrollback tweaks.
render command, to render markdown, optionally in a template.
Merge branch 'master' of git://github.com/muncus/dotfiles

Conflicts:
	.vimrc
	install.sh
quick script for pairing the Big Red Button.