Dev version for nnx.
Merge branch 'master' of https://github.com/andresy/torch-rocks