updates for testing modified code across workstations
Merge branch 'master' of git://github.com/jamesjcook/workstation_code