Bug fixes
Federal tax should be included
Merge branch 'master' of https://github.com/yakkob/SWACargo-Python

Conflicts:
	SWAServices.py