Formatted code using the Eclipse formatter.  I forgot to do this on the files that I modified previously so I ran it on the entire project
Fixed SCM to point at the atsid version on GitHub