Cleanup to prepare for pyramid_switchboard release.
Simplify startup with Make.
Merge pull request #1 from kadams54/master

Cleanup to prepare for pyramid_switchboard release.