Merge pull request #17 from lawinslow/master

Full merge of @lwinslow-usgs and @jread-usgs WiLMA edits