Added terminal config; changed stuff
Merge branch 'master' of github.com:patrick-conley/System-Setup

Conflicts:
	setup/fish.sh