Merge branch 'pevans-pmdafarm-per-actuator' of github.com:pauljevans/pcp into pauljevans-pevans-pmdafarm-per-actuator

Author: natoscott