Clean up commented code in environment.rb. Change install order of recipes.