Merge pull request #19 from jolyonb/jolyon

Reorganised parameters file. Increased sophistication of makefile.
Computer friendly output