Add ups directory for usage with EUPS, plus WITH_UPS scons option to install it (#360)
Merge branch 'master' into #352