Merge pull request #57 from TimSimpsonR/fix-int

Fixing the diagnostic tests
Fixing the dumb diag_demo
Fixing greedy pete
Redis Updates
Merge pull request #58 from cweidenkeller/redis_fixes

Redis Updates
Moved prepare code to common handler

Added ability to change repo preferences file.