Merge pull request #102 from andrewjpage/master

merge farm3 branch
Merge branch 'master' of github.com:sanger-pathogens/deployment
reconnect symlinks from nexsan to lustre