Whitespace and project tweaks
Merge branch 'master' of github.com:remobjects/train
Merge remote-tracking branch 'upstream/master'