GLEON/WiLMA — pull request #17 by lwinslow-usgs (2014-09-26 16:57:38+00:00)
Title: Full merge of @lwinslow-usgs and @jread-usgs WiLMA edits

All conflicts fixed and we should be back on track