* Tradeskill adjustments
Merge pull request #246 from stheno/master

* Tradeskill adjustments