Merge branch 'tidoc-1157' of https://github.com/bhatfield/doctools
Merge branch 'master' of https://github.com/appcelerator/doctools
Merge branch 'tidoc-1023' of https://github.com/arthurevans/doctools
Merge branch 'master' of https://github.com/appcelerator/doctools
[TIDOC-1004] Scripts to convert Alloy jsduck to JSON
Merge pull request #22 from bhatfield/tidoc-1004

[TIDOC-1004] Scripts to convert Alloy jsduck to JSON