Changes.
Merge branch 'master' of https://github.com/rockwolf/modules_generic
Merge branch 'master' of https://github.com/rockwolf/modules_generic

Conflicts:
	calculator_finance.py
	calculator_finance_test.py
Updates to commit.