updated DiscretizedLogistic

updated collect_outputs

add after_conv_0 and after_conv_1 argument to resnet

fix bug in previous vae_conv.py

Merge pull request #22 from haowen-xu/develop

The final version for 0.1.x