'proxy' fedora
Merge branch 'master' of ssh://tracker.dri.ie/navr/ansible-hydra

Conflicts:
	templates/haproxy/haproxy.cfg
fix up fedora play
use loadbalancer for fedora url so its easier to move things in the back
weight machines in haproxy
revert back to solr 4.0 due to query problems, most likely need to ugprade to blacklight 5.x