Merged laptop changes into desktop.
Moving environment variables into .profile