Adds tags
Fix tmux alias
Misc. updates
Merge branch 'master' of https://github.com/ndreynolds/dotfiles

Conflicts:
	fish/config.fish