Sniff http GET & POST
Merge branch 'master' of github.com:J12D/dotfiles

Conflicts:
	fish/config.fish