Merge Ian and Moniz branches

Let's get our two sets of code to agree.
In C, the first argument is always the executable
In Java, it's not included