A few changes to better support authorisation
Merge branch 'master' of github.com:mytestbed/labwiki