Changed order of performance data to be in line with our RRD
Added a variable for the apcupsd path, and fixed up some minor bugs