Removed JSON. Moved Data back into Controller.
Removed remaining disused Query to JSON file
Switched $scope for 'this' for use with Alias in views

Improves traceability of controller being used in views