Optional exchange_rate when converting money
Merge branch 'master' of https://github.com/Floqq/Rockefeller

Conflicts:
	rockefeller/money.py