Device Module selecting wrong input

@trystanlea has said (back in Feb) he will look into allowing both indexed and named inputs to be used in emoncms simultaneously as the current code seriously divides users into one camp or the other, mixing is really quite difficult.