Cleaned up code, added fire directory selection
Merge branch 'master' of https://github.com/uw-loci/curvelets