Simplify Income Tax and National Insurance

Adopts the proposal from #88 and adds depth to simplify the whole system.