committing to pull scott's fixes
fixed conflict
Merge branch 'master' of https://github.com/surette/softwaredev