Minor consistency checker updates in review.
Fixed broken test
Formatting updates
Optimized imports
Fixed MigrationJob unit tests
Merge pull request #36 from jewzaam/review-20141201

Consistency checker updates in review.
formatting
merge in changes from master
change daemon from simply dying upon failure, but rather to attempt restart