Fix scanner regex in MockBase and simplify it a little
Fix sorting of columns in MockBase by changing the HashMap to a TreeMap. Still
doesn't quite sort on bytes like HBase but it's closer for now.