Change pump/timer additions to a use embedded forms instead of popups, and allow cancelling them
Allow reordering of pumps and timers (and some minor UI fixes) with saving to the config file
Merge pull request #18 from DougEdey/master

Merge from master