Updates.
Merge branch 'master' of github.com:shawntan/theano_toolkit