Change env-vars to not overwrite already set vars
Merge pull request #154 from turtlebot/envupdates

Change env-vars to not overwrite already set vars