Updated user guide to include Worker
Added tree macros, added ugcal
Merging work between two computers
Merge branch 'master' of https://github.com/collicott/acqu