Tidy up
Make executable
Merge branch 'master' into omero4