minor merging.
Merge branch 'master' of github.com:brownrl/skeleton