Update my mailmap

Change-Id: Ia5e9b543ad1c9e21a722cf739d1469e63e2c005c
Use nova bindir of /usr/bin on Fedora

Fedora (and RHEL) like to install things in /usr/bin, e.g.

 01:30:42 Creating /usr/lib/python2.7/site-packages/nova.egg-link (link to .)
 01:30:42 Adding nova 2013.2.a1031.gfc5137d to easy-install.pth file
 01:30:42 Installing nova-dhcpbridge script to /usr/bin
 ...

The default nova/paths.py defaults to /usr/local/... which causes
quite a few errors when stressing various parts of nova and tools
aren't found.

Change-Id: Iaa93af96ddfb4deb6d16ea1dcac25ae6ed1e317d
ceilometer switch to setuptools console scripts

ceilometer has dropped bin scripts and switched to console scripts

blueprint setuptools-console-scripts

Change-Id: If6dff10471e351fe3640a60cc45fef719f671997
Merge "ceilometer switch to setuptools console scripts"
Merge "Use nova bindir of /usr/bin on Fedora"
Merge "Update my mailmap"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp