Merge pull request #15 from cschroed-usgs/master

Deleting accidentally duplicated class. Updating web.xml servlet class t...