Removed a large block of redundant code inside generate_sortkey().
Changed the sortkey template to use the 'sort_order' option keyword.
Changed the sortkey template in bibulous_test.py to use the 'sort_order' option keyword.
Minor modifications to test4 in testing suite.