Simplify edd_calculate_tax() function
Fix formatting of edd_calculate_tax()
Merge branch 'master' of github.com:easydigitaldownloads/Easy-Digital-Downloads
Fix formatting of edd_calculate_tax()