Refactoring

Its not really too different, I'm going to do some work to merge them together and get rid of MiniDfsClusterBuilder