context fix
Merge branch 'master' of https://github.com/NealSchneier/dev

Conflicts:
	finance/companies.py