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
Minor doc edit
(#350)
Slight modification to FITS InputCatalog to make sure it is picklable.
(#350)
Merge pull request #363 from GalSim-developers/#350

#350 DES module and a bunch of other stuff...
Merge branch 'master' into #298