cleanup merge conflicts
Merge remote-tracking branch 'origin/master' into havana
version bump
finish s/quantum/neutron/ from 7aaf979c42
Merge pull request #74 from invsblduck/havana_neutron_renames

finish s/quantum/neutron/ from 7aaf979c42
legacy filter_factory breaks havana neutron-server

(supposed to be fixed by https://bugs.launchpad.net/nova/+bug/1143998)
use newer (raring) openvswitch dkms

works with 12.04.[23]
install kernel headers before openvswitch dkms
change repo to havana in neutron-ovs-plugin, sets kombu as rpc_backend for neutron
Don't hard-code grizzly or havana in yum repo name

This coincides with refactored repo code in osops::packages
Switch to package_options from package_overrides
Merge branch 'havana' of github.com:rcbops-cookbooks/nova-network

Conflicts:
	attributes/default.rb
	metadata.rb