updated java code in pump controller project
Tidied up PumpController Project etc