Updated so expired payments reuse same address

 * There is a db view for savedAddresses now so we can reuse addresses
 * Updated math for calculating total paid
 * Updated how expected_amount is calculated for unwatched payments