Remove accidental extra client files from server package
Merge branch 'maint' of github.com:danfoster/bcfg2 into maint