Start on py.tests for printcrimes.py
Merge with master
Work on the doctests in printcrimes.py
Merge branch 'master' into output