Added parsing JSON options file, atm options override commandline options which isn't what we want!
Minor cleanup

Signed-off-by: Martin Evans <martindevans@gmail.com>