Re-arrange bashrc & profile to what looks like 'standard'