Merge branch 'rubocop' * rubocop: Update rubocop
Update rubocop And use settings from sgx-jmp
Copy in account activation logic from sgx-jmp This is largely duplicated code, but the whole web-activation path should go away soon. This fixes web activation to produce the data we actually expect instead of the hack previously produced. Instead of an account activation for 5 months, we insert 5 months of balance and then bill for only one month as is reasonable.