Merge branch 'penfield' of git://github.com/kgodey/philo into penfield