Updated parsing to remove constraint option and to give appropriate error messages. JASCIS-52
Merge branch 'devel' of proj.badc.rl.ac.uk:jasmin_cis into devel