Merge pull request #14 from asl-usgs/test-branch

Test branch
Merge branch 'test-branch'
Merge branch 'test-branch'
Merge branch 'test-branch'
Merge branch 'master' into test-branch