Revert "Reverses 07d3ec468a747f065bd5518896eb5cfd008689f3 where mike mistakenly removed code that is necessary to update jstree icons."

This reverts commit 862c3edbca467f639e742c891a3f77515e94dac6.
Revert "remove meaningless argument that got added recently"

This reverts commit 0cd17166aea9237d11c83c72acdb3b2a3f132d9d.
Merge pull request #78 from dimagi/cleanup

revert revert of non-breaking commits that got reverted together with a breaking commit
Smallest possible change to run in Travis-CI
Merge pull request #79 from kennknowles/browser-global-testing

Smallest possible change to run in Travis-CI
Merge branch 'master' of github.com:dimagi/Vellum into auto-height