Merge pull request #46 from l1ll1/master

bad Chris, multiple changes in one pull request
attempt to fix looking for the masterList.url in linux and mac builds. I'm not sure what the correct path is for py2exe builds
Merge branch 'master' of github.com:l1ll1/cvl-fabric-launcher
Merge pull request #47 from l1ll1/master

fix for masterlist.rurl on macos
set a default site config of 48 hours walltime, and load it from the siteconfig file
update the siteConfigs to support new default hours
Merge branch 'master' into aaf_auth

Conflicts:
	siteConfig.py
Fix crashes on the new version alert dialog

1) Although I was calling ShowModal from CallAfter (i.e on the
GuiThread) I was creating the dialog on a different thread. This is not
possible, so both creation and show modal are now done from call after

2) The new version Alter dialog used a flexgridsizer with only a single
column and an incorrect number of rows. Switched to a box sizer
remove a key error relating to auth_mode on first use of strudel
Layout changes

Change a radiobox to a combobox for use ssh keys verse use password
change the vertical alignment of various statictext elements so they
don't look quite so odd anymore.
Merge branch 'wx2.9_bugs' into aaf_auth

Conflicts:
	launcher.py
	optionsDialog.py
put radiobuttons back into the identity menu, switch to comboboxes rather than radioboxes, remove the option to select AAF Auth (can only use it if the flavour supports it/requests it)
slight improvements to the siteListDialog, buttons right aligned, columns expand when windowsize is changed
show the network fault dialog when the tunnels disapear. Actually this is a little agressive since the dialog will be shown if the session terminates due to walltime as well
Merge branch 'master' of https://github.com/monash-merc/cvl-fabric-launcher
new cvlsshutils
Merge branch 'master' into aaf_auth
use the absence or presence of authURL to determine AAF or password
add in the hidden job paramers aaf_idp and aaf_username, to be shown to the user when and if they are needed not in advance
cleanup, and pass the authURL down from the top