Fixed compiler error (Somehow the same version of GCC compiled this on
Travis.)

Added some more informative tests on user JSON inputs.
Merge remote-tracking branch 'wtsi-npg/devel' into devel
Merge pull request #96 from keithj/devel

Fixed compiler error