Almost works.
Merge branch 'master' of github.com:zenoss/europa-dev

* 'master' of github.com:zenoss/europa-dev:
  Improved Printing, Added Debug