ignore some junk files
Add ups directory for usage with EUPS, plus WITH_UPS scons option to install it (#360)
updated INSTALL notes for MacPorts
Merge branch 'master' into #350