Update version to 2.1.x and remove some defaulted exports
Merge branch 'master' of github.com:lrm29/fish_functions

Conflicts:
	OpenFOAM/fishrc