fixed agi calculation
Merge branch 'master' of https://github.com/OpenSourcePolicyCenter/Tax-Calculator into agifix