Added ${USER} in one spot for bashrc and noted where the USERNAME is set.