RFR: Refactored tract_math to unify the output procedure
Merge branch 'master' into tract_math_refactor
ENH: Corrected bug when the operation had varargs
BUG: Corrected bug in tract_math to handle several tracts on input
Merge branch 'master' of https://github.com/demianw/tract_querier
Merge branch 'master' into tract_math_refactor
ENH: Added support for output of images in tract_math
BUG: tract_math: Corrected bug in argument parsing
Merge branch 'master' into tract_math_refactor
Merge branch 'master' into tornado_server
Merge branch 'tornado_server' of github.com:demianw/tract_querier into tornado_server

Conflicts:
	scripts/tract_math