Add stuff from heimdall
Merge branch 'master' of github.com:jumpcannon/dot-config-fish

Conflicts:
	config.fish
	functions/ec.fish