forms now validate based on whether you prefer email or phone

Signed-off-by: Chris Jones <chris@jonezy.org>
getting packagemerging code into test

Signed-off-by: Chris Jones <chris@jonezy.org>
test to validate that package merge correctly

Signed-off-by: Chris Jones <chris@jonezy.org>
flag specs in the ui as auto/man

Signed-off-by: Chris Jones <chris@jonezy.org>
added optional icon to legend, made legal modal wider

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge pull request #278 from jonezy/master

Lots of small things, plus some unit tests around package merging.