Merge branch 'master' into dev

Dockerfile

@@ -15,8 +15,7 @@ RUN \
   luarocks install md5 && \
   luarocks install uuid && \
   luarocks install csvigo && \
-  PREFIX=$HOME/torch/install luarocks install turbo && \
-  luarocks install cudnn
+  PREFIX=$HOME/torch/install luarocks install turbo
 
 # suppress message `tput: No value for $TERM and no -T specified`
 ENV TERM xterm