Merge commit 'ee3a604ee14584a8f15462b0f34b07e93bc250cb' into fixBadMerge

Conflicts:
	.gitignore
	Builds/VisualStudio2013/RippleD.vcxproj
	src/ripple_app/ripple_app_pt9.cpp
	src/ripple_app/transactors/InflationTransactor.cpp
	test/inflation-test.js
	test/testconfig.js
	test/testutils.js
Merge branch 'fixBadMerge' into goSQL

Conflicts:
	.gitignore
	src/ripple_app/ripple_app_pt9.cpp
	src/ripple_app/transactors/InflationTransactor.cpp
	test/inflation-test.js
	test/testconfig.js
	test/testutils.js
all tests passing