Strip non-alphanumerics from BGP config.
Merge branch 'master' of github.com:Metaswitch/calico-chef

Conflicts:
	.gitignore
	README.md
	cookbooks/calico/templates/default/compute/bird.conf.erb