Further updates for changing to Catch testing and for Linux compilation.
Merge remote-tracking branch 'origin/drive_split' into update
AllDrive now compiling on OSX