Some more refactoring
Merge branch 'master' of https://github.com/leereilly/demandbase

Conflicts:
	README.md
Add government lookup
Add nonprofit lookup