Electronic and atomic shell structure in aluminium nanowires