Correct TSM details for wenleydale
SSL config that works on both 12.04 and 14.04
Merge wensleydale.it.ox.ac.uk:/etc/puppet