Cleaning up some files and doing some re-naming
Merge branch 'master' of https://github.com/ejzn/ca_tax_submit