More stone refactoring

Not sure why it has my merge in there, can anyone help me so that doesn't happen again? It doesn't seem to be affecting any files since it was me pulling over the new master.