Removed horrible $http.get nesting and refactored into $watches

Change-Id: Ia44f41872b1288a7115c6ae3e68b4a7692819808
Merge pull request #6 from kkochis/refactor

Removed horrible $http.get nesting and refactored into $watches
Merge pull request #9 from kkochis/master

Updating to latest in master