Add improved mixed example data augmentation

[ethanwharris]

Should include most of the experimented modes

https://arxiv.org/abs/1805.11272