clean up checkin.conf, and pep8
Merge pull request #14 from beav/confclean

The conf file was a little hard to understand for the multi-sw case. I