Temporarily patch around lp:1090592

Conflicts:
	conf/components/glance.yaml
	conf/components/keystone-client.yaml
Update horizon after working with it at yahoo
Remove the right setting
Use the seperated status for horizon
Don't pull in the newest requests package
Merge branch 'master' of github.com:harlowja/Openstack-Anvil
Update horizon after working with it at yahoo
Remove the right setting
Use the seperated status for horizon
Grizzly additions to get it working again

Updated dependency mappings and epel rpm name.
Merge branch 'master' of github.com:harlowja/Openstack-Anvil
Merge pull request #372 from harlowja/master

Cleanups
Handle pip package conflicts differently.

Instead of completly dying when a installed pip does not
match a desired pip, check if desired pip has the upgrade
option and if so, then allow install to proceed.
Merge pull request #376 from harlowja/master

Handle pip upgrades slightly better.
Use a set of constants for emails and summaries to skip.
Use the right requirement key
Merge pull request #378 from harlowja/master

Changelog and testing fixups.
Add discover dependency
Add testrepository dependency
Adjust logging and remove boto version restriction