Fix another return datatype bug for getopt and some clode cleanup
Merge branch 'devel' of file:///Users/phil/Dropbox/git/opendax into devel