Updates
Resolve conflicts
Resolve conflicts
Use monitoring_batches=1 to avoid class representation issues
Cleanup
Cleanup
Add sanity checks
Add monitoring_batch_size
Add test
Resolve conflicts
Update default learning algorithm
Default to batch_size and batches_per_iter if monitoring_batch_size and monitoring_batches are None
Default parameter fix
Merge remote-tracking branch 'upstream/master' into monitoring_batch_size
Move defaulting closer to monitor setup, since batch_size can be changed after __init__
Try to fix strange zero length error in Travis build
Try to fix zero-length error
Try to fix zero-length error
Change string formatting
Clean up test