stuff
Merging

Merge branch 'master' of https://github.com/sheldonth/torchlight