a few updates, and a cool git alias
Merge branch 'master' of https://github.com/whyrusleeping/dotfiles

Conflicts:
	config.fish