Merge pull request #143 from guybedford/master

Various
trace API adjustments for easier dependency extraction
document trace API
0.6.1
remove with statement