complements the train_flag branch in mungebits
Merge branch 'master' into train_flag
Merge branch 'syberia_structure' into train_flag
merge syberia_structure and fix tests and upgrade to roxygen 4.0.0