Merge pull request #333 from jpecht/master

modified sales tax tooltip content
Merge remote-tracking branch 'upstream/master'
Merge pull request #335 from jpecht/master

organization / refactor update
Merge remote-tracking branch 'upstream/master'