fixed systemic bug, continuing work on conditional model, added dropout to neural
Merge branch 'master' of https://github.com/nicholas-leonard/equanimity
merged changes from zhen zhou.