codebox: snippet added
bash_profile: cleaned up and updated
conflicts corrected