Move it to the correct location and add the new field. Also tidy up some of the instructions dealing with loading this data. Signed-off-by: Dan McGee <dan@archlinux.org>
