Updated rake tasks and removed some duplication in the env.rb file