Currency formatter uses USD
Updates changelog
Tests for formatter
Rename to include formatter names in tests
Merge branch 'upstream' into develop

Conflicts:
	Changelog.txt
Merge pull request #159 from tpkelly/develop

Currency formatter uses USD