Merge branches 'master' and 'john'
Nests picture model under trees. Updates .gitignore.
Merge branch 'john' of github.com:johnjameswhitman/cocobolo into john