Resolve conflicts after pulling upstream dev.
Factor IterCallback classes into hpp and cpp.
Factor IterCallback into hpp and cpp
Factor TrainingStats hpp into hpp and cpp.
Resolving conflicts.
Resolve more conflicts.
Fix rebase conflict?
Fix lint.
Fix pycaffe build.
Add start_iter_ to training stats.
Harmonize solver logic with latest dev.