Merge pull request #1 from ncdc/master

Starting to set up for Maven