fix spelling error in trees_controller
Merge branch 'master' of github.com:johnjameswhitman/cocobolo
update Gemfile