Merge branch 'master' of http://github.com/bnhymn/dotfiles

Conflicts:
	config/fish/config.fish
	mutt/bnhymn
	mutt/muttrc
Added ssh-agent to xinitrc