merging over fixes from mangrove-server, fixing updates w/ $http