Rearrangement of training; fixes #18, #19, #20
Merge branch 'master' of github.com:pcav/faunalia