Moving the data local
Adding a divshot config file.
Removing debug changes to the controller.
Resolving conflicts