full billing / address support for merch, closes #13