Feature/angular config settings

Ideas on how to move some stuff out of the controller welcome, although I think most of it is controller logic.