In process (turning back over to Danny).
Merge branch 'master' of github.com:dtkaplan/USCOTS