updated standalone config
updated fish to 2.1.1
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config.sh