Merge pull request #19 from bbarker/master

ATS development environment
minor fixes