Merge branch 'softplus_improved' of github.com:jonathantompson/nn
Merge branch 'master_remote' of github.com:jonathantompson/nn into master_remote